Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged

diff --cc Makefile.am
index 3df35ad3f31cd42afa1be87a2703f4078fea38be,01ed8c935ee0363ff846eb868485d9a1c1a5885d..adf02122ffdd34b13c7e211eefa151d7dd5bec45
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -131,8 -126,15 +131,16 @@@ TOR_INTERNAL_TESTING_LIBS = 
        $(TOR_UTIL_TESTING_LIBS) \
        src/trunnel/libor-trunnel-testing.a \
        src/lib/libtor-trace.a
 +endif
  
+ TOR_LDFLAGS_CRYPTLIB=@TOR_LDFLAGS_openssl@
+ TOR_LIBS_CRYPTLIB=@TOR_OPENSSL_LIBS@
+ TOR_CFLAGS_CRYPTLIB=
+ if USE_NSS
+ TOR_CFLAGS_CRYPTLIB+=@NSS_CFLAGS@
+ TOR_LIBS_CRYPTLIB+=@NSS_LIBS@
+ endif
+ 
  # All libraries used to link tor-cov
  
  include src/include.am

diff --cc configure.ac
Simple merge

diff --cc src/ext/tinytest.c
Simple merge

diff --cc src/feature/relay/router.c
Simple merge

diff --cc src/lib/crypt_ops/include.am
index 017d7956d0115c5130a4537bb7b517309f189ea4,803d448852f7263eaad1e65de246302d7bd21489..8647a91e8cac5aef3e020851f52b99e42b35775f
--- 1/src/lib/crypt_ops/include.am
--- 2/src/lib/crypt_ops/include.am
+++ b/src/lib/crypt_ops/include.am
@@@ -14,8 -14,7 +14,9 @@@ src_lib_libtor_crypt_ops_a_SOURCES =                  
        src/lib/crypt_ops/crypto_ed25519.c              \
        src/lib/crypt_ops/crypto_format.c               \
        src/lib/crypt_ops/crypto_hkdf.c                 \
+       src/lib/crypt_ops/crypto_init.c                 \
 +      src/lib/crypt_ops/crypto_ope.c                  \
 +      src/lib/crypt_ops/crypto_openssl_mgt.c          \
        src/lib/crypt_ops/crypto_pwbox.c                \
        src/lib/crypt_ops/crypto_rand.c                 \
        src/lib/crypt_ops/crypto_rsa.c                  \
@@@ -36,10 -53,11 +55,12 @@@ noinst_HEADERS +=                                  
        src/lib/crypt_ops/crypto_digest.h               \
        src/lib/crypt_ops/crypto_ed25519.h              \
        src/lib/crypt_ops/crypto_format.h               \
-       src/lib/crypt_ops/crypto.h                      \
+       src/lib/crypt_ops/crypto_cipher.h               \
        src/lib/crypt_ops/crypto_hkdf.h                 \
+       src/lib/crypt_ops/crypto_init.h                 \
+       src/lib/crypt_ops/crypto_nss_mgt.h              \
        src/lib/crypt_ops/crypto_openssl_mgt.h          \
 +      src/lib/crypt_ops/crypto_ope.h                  \
        src/lib/crypt_ops/crypto_pwbox.h                \
        src/lib/crypt_ops/crypto_rand.h                 \
        src/lib/crypt_ops/crypto_rsa.h                  \

diff --cc src/rust/build.rs
Simple merge

diff --cc src/test/fuzz/include.am
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/tools/include.am
index d5924dda5f77cadd9c9199f6692e959b62661cdb,7c5d3f0bc8ff8996a7aec34838dcc6f9b68c3e00..cdd5616fb19fdcd5bde46985b1a2834ffcdfb05b
--- 1/src/tools/include.am
--- 2/src/tools/include.am
+++ b/src/tools/include.am
@@@ -26,18 -26,9 +26,18 @@@ src_tools_tor_gencert_LDADD = 
        $(TOR_CRYPTO_LIBS) \
        $(TOR_UTIL_LIBS) \
        $(rust_ldadd) \
-       @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
+       @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \
        @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@
  
-       @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ \
 +src_tools_tor_print_ed_signing_cert_SOURCES = src/tools/tor-print-ed-signing-cert.c
 +src_tools_tor_print_ed_signing_cert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
 +src_tools_tor_print_ed_signing_cert_LDADD = \
 +      src/trunnel/libor-trunnel.a \
 +        $(TOR_CRYPTO_LIBS) \
 +        $(TOR_UTIL_LIBS) \
++      @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \
 +      @TOR_LIB_WS32@ @TOR_LIB_USERENV@
 +
  if COVERAGE_ENABLED
  src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c
  src_tools_tor_cov_gencert_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)