Merge remote-tracking branch 'upstream/master' into buildfixes

diff --cc cmake/StaticBuild.cmake
index 84fe0a8e75a1acdff50f069884f96a781fb777fb,df12db41edb02743b9e0b919025590c12058be34..49706bd356bf4f689a22d4b711501945b50bedde
--- 1/cmake/StaticBuild.cmake
--- 2/cmake/StaticBuild.cmake
+++ b/cmake/StaticBuild.cmake
@@@ -30,16 -30,11 +30,16 @@@ if(BUILD_STATIC
        HINTS ${PC_GNUTLS_LIBDIR} ${PC_GNUTLS_LIBRARY_DIRS})
      FIND_LIBRARY(NETTLE_LIBRARY NAMES nettle libnettle
        HINTS ${PC_GNUTLS_LIBDIR} ${PC_GNUTLS_LIBRARY_DIRS})
 +    FIND_LIBRARY(TASN1_LIBRARY NAMES tasn1 libtasn1
 +      HINTS ${PC_GNUTLS_LIBDIR} ${PC_GNUTLS_LIBRARY_DIRS})
  
 -    set(GNUTLS_LIBRARIES "-Wl,-Bstatic -lgnutls -ltasn1")
 +    set(GNUTLS_LIBRARIES "-Wl,-Bstatic -lgnutls")
  
 +    if(TASN1_LIBRARY)
 +      set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -ltasn1")
 +    endif()
      if(NETTLE_LIBRARY)
-       set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lnettle -lhogweed -lgmp -lcrypt32")
+       set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lnettle -lhogweed -lgmp")
      endif()
      if(GCRYPT_LIBRARY)
        set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lgcrypt -lgpg-error")