27238 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	57b207efa4	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-05 10:15:42 -04:00
Nick Mathewson	ff1486385a	Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9	2018-09-05 10:14:56 -04:00
Nick Mathewson	2b1b8bf2ca	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-05 09:56:19 -04:00
teor	35b0ac8d84	Travis: don't call echo with a --flag as the first argument ... When we use echo in Travis, don't pass a --flag as the first argument. Fixes bug 27418; bugfix on 0.3.4.7-rc.	2018-09-05 14:02:46 +10:00
teor	4e4b6a2476	Travis: when showing a log fails, keep trying to show other logs ... When a Travis build fails, and showing a log fails, keep trying to show the other logs. Fixes bug 27453; bugfix on 0.3.4.7-rc.	2018-09-05 13:12:54 +10:00
Nick Mathewson	b40f9967fa	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-29 11:17:31 -04:00
teor	541b89b061	Test: avoid spurious failures in make test-network-all ... Before running make test-network-all, delete old logs and test result files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.	2018-08-29 10:47:20 +10:00
teor	3e298633ca	Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am ... Part of 27295.	2018-08-29 10:47:05 +10:00
teor	70a07fa90b	When running make test-network-all, use the mixed+hs-v2 network ... No behaviour change. A previous fix to chutney removed v3 onion services from the mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is confusing. Fixes bug 27345; bugfix on 0.3.2.1-alpha.	2018-08-27 23:07:20 +10:00
Nick Mathewson	98e1a1d106	Merge branch 'ticket27286_032_v2' into maint-0.3.2	2018-08-24 12:32:06 -04:00
Nick Mathewson	14be9cba4e	Update the protocol versions recommendations to remove LinkAuth=1 ... LinkAuth method 1 is the one where we pull the TLS master secrets out of the OpenSSL data structures and authenticate them with RSA. Right now we list method 1 as required for clients and relays. That's a problem, since we can't reasonably support it with NSS. So let's remove it as a requirement and a recommendation. As for method 3: I'd like to recommend it it, but that would make 0.2.9 start warning. Let's not do that till at least some time after 0.3.5 (the next LTS) is stable. Closes ticket 27286	2018-08-24 12:31:01 -04:00
Nick Mathewson	36bb11a650	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-23 19:36:45 -04:00
teor	cc4ea34a26	Silence a compilation warning on MSVC 2017 and clang-cl ... test.c no longer uses lround(), so we don't need to declare it, and we can use math.h for fabs(). Fixes bug 27185; bugfix on 0.2.2.2-alpha.	2018-08-24 09:15:04 +10:00
Nick Mathewson	c1ad40627b	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-22 09:37:31 -04:00
Nick Mathewson	9068e2fa28	Mark cert_matches_key as not-intrusive; fix stretch compilation.	2018-08-22 09:37:26 -04:00
Nick Mathewson	a5bbe3f1d0	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-21 20:03:46 -04:00
Nick Mathewson	a29e9a901d	Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2	2018-08-21 20:03:41 -04:00
Nick Mathewson	05d62a3b73	Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9	2018-08-21 20:03:19 -04:00
Nick Mathewson	d52f406001	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-21 19:16:40 -04:00
Nick Mathewson	85a8792344	Rewrite test_tortls_cert_matches_key() ... Unlike the old test, this test no will no longer mess around with the forbidden internals of any openssl data structures. Additionally, it verifies several other behaviors of tor_tls_cert_matches_key() that we had wanted to verify, such as the possibility of the certificate's key not matching. Fixes bug 27226; bugfix on 0.2.5.1-alpha.	2018-08-20 17:43:41 -04:00
Nick Mathewson	c1f476a3d5	Use our x509 wrapper code in tor_tls_cert_matches_key() ... This allows us to mock our own tor_tls_get_peer_certificate() function in order to test ..cert_matches_key(), which will in turn allow us to simplify test_tortls_cert_matches_key() considerably. Prep work for the fix for 27226.	2018-08-20 17:42:38 -04:00
George Kadianakis	c798957b59	Keep descriptor rotation time after HUP occurs.	2018-08-16 08:36:48 -04:00
teor	db3414dd51	Rust: Say that we support rust stable in GettingStartedRust.md ... In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160.	2018-08-16 18:58:47 +10:00
Nick Mathewson	a26a2735b9	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-15 12:20:57 -04:00
Nick Mathewson	4c355ff185	Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9	2018-08-15 12:20:53 -04:00
teor	e2eec40c44	Merge branch 'travis-osx-029' into travis-osx-032 ... Merge asciidoc from 029 with rust from 032.	2018-08-10 19:06:01 +10:00
teor	d514e98663	Travis: add a missing macOS asciidoc env var	2018-08-10 18:26:33 +10:00
teor	69adc68ac6	Merge branch 'travis-osx-029' into travis-osx-032 ... Simple merge to resolve order conflicts.	2018-08-10 16:31:35 +10:00
teor	169afe3ca5	Travis: Improve Rust comments	2018-08-10 16:30:21 +10:00
teor	e78f9c5dfb	Travis: add a missing macOS asciidoc dependency	2018-08-10 16:24:31 +10:00
teor	f4f2e43f5d	Travis: put distcheck first for readability	2018-08-10 12:33:51 +10:00
teor	4cd3fcf248	Changes file for Travis: enable macOS builds	2018-08-10 12:10:56 +10:00
teor	4517c4c3e3	Changes file for Rust: backport src/test/test_rust.sh from master	2018-08-10 11:26:53 +10:00
teor	3b1c74baa5	Travis: Use cargo cache ... Closes ticket 26952.	2018-08-10 11:23:26 +10:00
teor	c9ad16ca2a	Fix $abs_top_srcdir in test_rust.sh ... Consistently use ../../.. as a fallback for $abs_top_srcdir in test_rust.sh. Fixes bug 27093; bugfix on 0.3.4.3-alpha.	2018-08-10 11:22:36 +10:00
teor	ce19477ffc	Stop setting $CARGO_HOME ... cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha.	2018-08-10 11:14:32 +10:00
teor	2a35b085ee	Rust: backport src/test/test_rust.sh from master ... Preparation for 26497.	2018-08-10 11:09:18 +10:00
teor	f76cddd376	Travis: fix a typo	2018-08-10 10:50:35 +10:00
teor	aee51d9a0e	Travis: fix a typo	2018-08-09 23:44:27 +10:00
teor	e387eee362	Travis: add rust cargo offline mode ... Backports parts of the 0.3.3 travis config. Part of 24629.	2018-08-09 23:42:26 +10:00
teor	14ceee0fd1	Travis: add rust cargo online mode ... Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Also: * build rust on clang and gcc, Linux and macOS * build combinations of non-default options on gcc Linux * exclude broken builds * log the rustup version Part of 24629.	2018-08-09 23:40:24 +10:00
Nick Mathewson	8982719f6a	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-08-09 08:47:24 -04:00
teor	e4d7f2667c	Travis: add lzma and zstd, where available ... Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Part of 24629, also fixes 27090.	2018-08-09 22:22:27 +10:00
teor	38cf52b023	Merge branch 'travis-osx-029' into travis-osx-032 ... Replace 032 .travis.yml with 029 .travis.yml. Subsequent commits will restore 032 functionality.	2018-08-09 22:20:29 +10:00
teor	fa9a0cc1fe	Travis: list installed package versions before building ... Part of 24629.	2018-08-09 22:19:03 +10:00
teor	23b242104b	Travis: run an asciidoc build ... Implements 27087.	2018-08-09 22:19:00 +10:00
teor	286a6bc3b8	Travis: Use ccache ... Part of ticket 26952.	2018-08-09 22:18:53 +10:00
teor	74b3a340df	Travis: make macOS builds work for Tor 0.2.9 ... Tor 0.2.9 needs extra help to find OpenSSL on macOS. Part of 24629.	2018-08-09 22:18:44 +10:00
teor	7cf7b52fca	Travis: create configure flags once, then echo the flags ... Creating the configure flags once avoids inconsistent flags between configure and distcheck configure. Echoing the flags helps developers work out what configure is doing. (Backported to 0.2.9 and later as a precaution.) Fixes 27088 on 0.3.4.1-alpha, adds logging in previous releases.	2018-08-09 22:18:12 +10:00
teor	515d190b2c	Travis: enable macOS builds ... Also: * explain why we don't install zlib Part of 24629.	2018-08-09 22:17:50 +10:00