Merge branch 'nss_squashed' into nss_merge

2024-12-06 19:41:15 +01:00 · 2018-09-04 20:21:07 -04:00
parent fd994f55c4 d644c93ae9
commit 0db5c54957
108 changed files with 11223 additions and 7115 deletions
@@ -172,6 +172,7 @@ pub fn main() {

            cfg.from_cflags("TOR_ZLIB_LIBS");
            cfg.from_cflags("TOR_LIB_MATH");
+            cfg.from_cflags("NSS_LIBS");
            cfg.from_cflags("TOR_OPENSSL_LIBS");
            cfg.from_cflags("TOR_LIBEVENT_LIBS");
            cfg.from_cflags("TOR_LIB_WS32");