28346 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	8408331b3e	Merge branch 'maint-0.2.9' into maint-0.3.2 ... "ours" to avoid version bump.	2018-09-10 09:41:39 -04:00
Nick Mathewson	ec4a7641f1	Bump to 0.3.2.12-dev	2018-09-10 09:41:34 -04:00
Nick Mathewson	b203dedaf5	Bump to 0.2.9.17-dev	2018-09-10 09:41:22 -04:00
Nick Mathewson	cff7cb858b	Merge branch 'maint-0.3.2' into maint-0.3.3 ... "ours" to avoid bump	2018-09-07 15:12:09 -04:00
Nick Mathewson	36885f34f6	Merge branch 'maint-0.2.9' into maint-0.3.2 ... "ours" to avoid bump	2018-09-07 15:11:49 -04:00
Nick Mathewson	43e400f340	Bump to 0.3.3.10	2018-09-07 15:11:18 -04:00
Nick Mathewson	cdaf9aec8e	Bump to 0.3.2.12	2018-09-07 15:11:07 -04:00
Nick Mathewson	da29074fc4	Bump to 0.2.9.17	2018-09-07 15:10:49 -04:00
Nick Mathewson	732ea9120c	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-07 09:15:56 -04:00
Nick Mathewson	0366ae224c	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-07 09:15:52 -04:00
Nick Mathewson	1e46a391b3	Merge branch 'ticket27344_029' into maint-0.2.9	2018-09-07 09:15:15 -04:00
Nick Mathewson	2ec88a2a6d	Tell openssl to build its TLS contexts with security level 1 ... Fixes bug 27344, where we'd break compatibility with old tors by rejecting RSA1024 and DH1024.	2018-09-07 09:15:06 -04:00
Nick Mathewson	056003d602	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-07 08:46:45 -04:00
Nick Mathewson	987e12a58f	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-07 08:46:45 -04:00
Nick Mathewson	eacaff6ccc	Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2	2018-09-07 08:46:41 -04:00
Nick Mathewson	9fcb3ef787	Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9	2018-09-07 08:46:35 -04:00
Nick Mathewson	df18cf0e8f	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-07 08:44:40 -04:00
Nick Mathewson	a5ed62f96c	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-07 08:44:39 -04:00
Nick Mathewson	912ae2b8dc	Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9	2018-09-07 08:44:36 -04:00
Nick Mathewson	08d5fd39d8	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-07 08:42:19 -04:00
Nick Mathewson	a08e6e711f	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-07 08:42:19 -04:00
teor	d2105ff5d5	Merge branch 'bug27461-029' into bug27461-032 ... Fix a minor merge conflict due to an #endif comment.	2018-09-07 13:00:34 +10:00
teor	8ef4bb7f3e	Windows: Stop calling SetProcessDEPPolicy() on 64-bit Windows ... It is not supported, and always fails. Some compilers warn about the function pointer cast on 64-bit Windows. Fixes bug 27461; bugfix on 0.2.2.23-alpha.	2018-09-07 12:58:11 +10:00
teor	9d5c6317b5	hs: Silence a spurious warning in rend_client_send_introduction() ... gcc 8 warns that extend_info_t.nickname might be truncated by strncpy(). But it doesn't know that nickname can either contain a hex id, or a nicknames. hex ids are only used for general and HSDir circuits. Fixes bug 27463; bugfix on 0.1.1.2-alpha.	2018-09-07 12:40:11 +10:00
teor	1570f17f97	Windows: Silence a spurious warning in the GetAdaptersAddresses cast ... GetProcAddress() returns FARPROC, which is (long long int(*)()) on 64-bit Windows: https://msdn.microsoft.com/en-us/library/windows/desktop/ms683212(v=vs.85).aspx But GetAdaptersAddresses() is (long unsigned int(*)()), on both 32-bit and 64-bit Windows: https://docs.microsoft.com/en-us/windows/desktop/api/iphlpapi/nf-iphlpapi-getadaptersaddresses So gcc 8 issues a spurious "incompatible function pointer" warning about the cast to GetAdaptersAddresses_fn_t. Silence this warning by casting to a void function pointer, before the cast to GetAdaptersAddresses_fn_t. This issue is already fixed by 26481 in 0.3.5 and later, by removing the lookup and cast. Fixes bug 27465; bugfix on 0.2.3.11-alpha.	2018-09-07 11:03:10 +10:00
Nick Mathewson	a7e72f0c44	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-05 10:15:45 -04:00
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	67bdd144bd	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-09-05 09:56:19 -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	a28c14aad5	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-29 11:17:31 -04: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
Nick Mathewson	64c3c6a790	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-27 09:39:08 -04: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	33e4e30d0a	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-24 12:32:10 -04: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	e01ea64f0a	Merge branch 'maint-0.3.2' into maint-0.3.3	2018-08-23 19:36:45 -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
teor	ae2085dd7b	Merge branch 'ticket27252-032' into ticket27252-033 ... Semantic merge: - Rust offline and online were swapped in ticket27252-032 - TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2	2018-08-23 18:19:42 +10:00
teor	92f1a8af83	Travis: Skip offline rust builds for Linux gcc ... We already do an online rust build for Linux gcc. Part of 27252.	2018-08-23 18:18:14 +10:00
teor	b61d40c8a2	Travis: Only run one online rust build, to reduce network errors ... Part of 27252.	2018-08-23 18:17:03 +10:00
teor	99a2ecc795	Merge branch 'ticket27252-029' into ticket27252-032 ... This commit is already implemented in 0.3.2 and later: - Travis: Skip a duplicate hardening-off build in Tor 0.2.9	2018-08-23 18:15:55 +10:00
teor	7cea5a287f	Travis: Skip gcc on Linux with default settings ... It's redundant, because all the non-default builds use gcc on Linux. Part of 27252.	2018-08-23 18:13:53 +10:00
teor	9f81e03262	Travis: make the exclude descriptions shorter ... Part of 27252.	2018-08-23 18:12:36 +10:00