]>
git.ipfire.org Git - thirdparty/tor.git/log
Nick Mathewson [Fri, 7 Sep 2018 19:49:33 +0000 (15:49 -0400)]
Construct changelog for 0.3.3.10
Nick Mathewson [Fri, 7 Sep 2018 19:13:59 +0000 (15:13 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 19:12:09 +0000 (15:12 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
"ours" to avoid bump
Nick Mathewson [Fri, 7 Sep 2018 19:11:49 +0000 (15:11 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
"ours" to avoid bump
Nick Mathewson [Fri, 7 Sep 2018 19:11:18 +0000 (15:11 -0400)]
Bump to 0.3.3.10
Nick Mathewson [Fri, 7 Sep 2018 19:11:07 +0000 (15:11 -0400)]
Bump to 0.3.2.12
Nick Mathewson [Fri, 7 Sep 2018 19:10:49 +0000 (15:10 -0400)]
Bump to 0.2.9.17
Nick Mathewson [Fri, 7 Sep 2018 13:15:56 +0000 (09:15 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 13:15:56 +0000 (09:15 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 13:15:52 +0000 (09:15 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 13:15:15 +0000 (09:15 -0400)]
Merge branch 'ticket27344_029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 12:57:14 +0000 (08:57 -0400)]
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.
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:46:41 +0000 (08:46 -0400)]
Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:46:35 +0000 (08:46 -0400)]
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 12:44:40 +0000 (08:44 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:44:40 +0000 (08:44 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:44:39 +0000 (08:44 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:44:36 +0000 (08:44 -0400)]
Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 12:42:19 +0000 (08:42 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:42:19 +0000 (08:42 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:42:19 +0000 (08:42 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
teor [Fri, 7 Sep 2018 03:00:34 +0000 (13:00 +1000)]
Merge branch 'bug27461-029' into bug27461-032
Fix a minor merge conflict due to an #endif comment.
teor [Fri, 7 Sep 2018 02:58:11 +0000 (12:58 +1000)]
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.
teor [Wed, 5 Sep 2018 11:07:58 +0000 (21:07 +1000)]
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.
teor [Thu, 6 Sep 2018 03:11:23 +0000 (13:11 +1000)]
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.
Nick Mathewson [Wed, 5 Sep 2018 14:15:45 +0000 (10:15 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Wed, 5 Sep 2018 14:15:45 +0000 (10:15 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 5 Sep 2018 14:15:42 +0000 (10:15 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 5 Sep 2018 14:14:56 +0000 (10:14 -0400)]
Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
Nick Mathewson [Wed, 5 Sep 2018 13:56:19 +0000 (09:56 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Wed, 5 Sep 2018 13:56:19 +0000 (09:56 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 5 Sep 2018 13:56:19 +0000 (09:56 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
teor [Wed, 5 Sep 2018 03:30:17 +0000 (13:30 +1000)]
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.
teor [Wed, 5 Sep 2018 03:12:54 +0000 (13:12 +1000)]
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.
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
teor [Fri, 24 Aug 2018 00:25:25 +0000 (10:25 +1000)]
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.
teor [Fri, 24 Aug 2018 00:20:30 +0000 (10:20 +1000)]
Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am
Part of 27295.
Nick Mathewson [Mon, 27 Aug 2018 13:39:08 +0000 (09:39 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Mon, 27 Aug 2018 13:39:08 +0000 (09:39 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
teor [Mon, 27 Aug 2018 13:06:04 +0000 (23:06 +1000)]
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.
Nick Mathewson [Fri, 24 Aug 2018 16:32:10 +0000 (12:32 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Fri, 24 Aug 2018 16:32:10 +0000 (12:32 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 24 Aug 2018 16:32:06 +0000 (12:32 -0400)]
Merge branch 'ticket27286_032_v2' into maint-0.3.2
Nick Mathewson [Thu, 23 Aug 2018 15:24:39 +0000 (11:24 -0400)]
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
Nick Mathewson [Thu, 23 Aug 2018 23:36:45 +0000 (19:36 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Thu, 23 Aug 2018 23:36:45 +0000 (19:36 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 23 Aug 2018 23:36:45 +0000 (19:36 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
teor [Thu, 23 Aug 2018 08:55:39 +0000 (18:55 +1000)]
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.
Nick Mathewson [Wed, 22 Aug 2018 13:37:31 +0000 (09:37 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 22 Aug 2018 13:37:31 +0000 (09:37 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 13:37:31 +0000 (09:37 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 13:37:26 +0000 (09:37 -0400)]
Mark cert_matches_key as not-intrusive; fix stretch compilation.
Nick Mathewson [Wed, 22 Aug 2018 00:04:17 +0000 (20:04 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 00:04:17 +0000 (20:04 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 00:03:56 +0000 (20:03 -0400)]
Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 00:03:46 +0000 (20:03 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 22 Aug 2018 00:03:41 +0000 (20:03 -0400)]
Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
Nick Mathewson [Wed, 22 Aug 2018 00:03:19 +0000 (20:03 -0400)]
Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9
Nick Mathewson [Tue, 21 Aug 2018 23:16:40 +0000 (19:16 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Tue, 21 Aug 2018 23:16:40 +0000 (19:16 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 21 Aug 2018 23:16:40 +0000 (19:16 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Tue, 21 Aug 2018 14:01:41 +0000 (10:01 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Tue, 21 Aug 2018 14:01:38 +0000 (10:01 -0400)]
Add changes file for 26873. I missed this when merging earlier.
Nick Mathewson [Mon, 20 Aug 2018 21:43:41 +0000 (17:43 -0400)]
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.
Nick Mathewson [Mon, 20 Aug 2018 21:42:38 +0000 (17:42 -0400)]
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.
Nick Mathewson [Fri, 17 Aug 2018 13:38:26 +0000 (09:38 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Fri, 17 Aug 2018 13:38:08 +0000 (09:38 -0400)]
Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3
cypherpunks [Fri, 17 Aug 2018 03:22:47 +0000 (03:22 +0000)]
rust/protover: don't accept whitespace in ProtoSet::from_str()
It's impossible for spaces to get here, since spaces are used as
separators between individual protocol entries higher up.
And it shouldn't ignore whitespace that isn't a literal space
character, because that would differ from the C implementation.
These were added in
9925d2e68709aa7346f4c5bc98ea1349df6741f3 .
Fixes #27177. Bugfix on 0.3.3.5-rc.
Nick Mathewson [Fri, 17 Aug 2018 13:29:46 +0000 (09:29 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
cypherpunks [Tue, 7 Aug 2018 00:45:33 +0000 (00:45 +0000)]
rust/protover: fix hyphen parsing bug in ProtoSet::from_str()
It was parsing "1-2-3" as if it were 1-2, ignoring the 2nd hyphen
and everything after.
Introduced in
d1820c1516a31a149fc51a9e5126bf899e4c4e08 .
Fixes #27164; bugfix on 0.3.3.1-alpha.
Nick Mathewson [Thu, 16 Aug 2018 12:37:11 +0000 (08:37 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 16 Aug 2018 12:37:11 +0000 (08:37 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
George Kadianakis [Sat, 28 Jul 2018 15:31:46 +0000 (17:31 +0200)]
Keep descriptor rotation time after HUP occurs.
Nick Mathewson [Thu, 16 Aug 2018 12:35:31 +0000 (08:35 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Thu, 16 Aug 2018 12:35:27 +0000 (08:35 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
teor [Thu, 16 Aug 2018 08:58:47 +0000 (18:58 +1000)]
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.
Nick Mathewson [Wed, 15 Aug 2018 16:20:57 +0000 (12:20 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Wed, 15 Aug 2018 16:20:57 +0000 (12:20 -0400)]
Merge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 15 Aug 2018 16:20:57 +0000 (12:20 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 15 Aug 2018 16:20:53 +0000 (12:20 -0400)]
Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
Nick Mathewson [Wed, 15 Aug 2018 06:18:54 +0000 (02:18 -0400)]
Merge branch 'maint-0.3.3' into release-0.3.3
Nick Mathewson [Wed, 15 Aug 2018 06:16:19 +0000 (02:16 -0400)]
Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3
teor [Fri, 10 Aug 2018 09:06:32 +0000 (19:06 +1000)]
Merge branch 'travis-osx-032' into travis-osx-033
teor [Fri, 10 Aug 2018 09:05:49 +0000 (19:05 +1000)]
Merge branch 'travis-osx-029' into travis-osx-032
Merge asciidoc from 029 with rust from 032.
teor [Fri, 10 Aug 2018 08:26:33 +0000 (18:26 +1000)]
Travis: add a missing macOS asciidoc env var
teor [Fri, 10 Aug 2018 06:38:13 +0000 (16:38 +1000)]
Merge branch 'travis-osx-032' into travis-osx-033
Preserve 033 changes since 032.
teor [Fri, 10 Aug 2018 03:11:27 +0000 (13:11 +1000)]
Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4
Re-applies 0.3.3 changes after 24629.
teor [Fri, 10 Aug 2018 01:59:42 +0000 (11:59 +1000)]
Travis: Check Rust with distcheck in 0.3.3 and later
Backports an 0.3.4 change that also works in 0.3.3.
Part of 24629.
teor [Fri, 10 Aug 2018 01:55:50 +0000 (11:55 +1000)]
Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later
TOR_RUST_DEPENDENCIES used to be spelt RUST_DEPENDENCIES in 0.3.2.
Re-applies 0.3.3 changes after 24629.
teor [Fri, 10 Aug 2018 06:31:35 +0000 (16:31 +1000)]
Merge branch 'travis-osx-029' into travis-osx-032
Simple merge to resolve order conflicts.
teor [Fri, 10 Aug 2018 06:30:21 +0000 (16:30 +1000)]
Travis: Improve Rust comments
teor [Fri, 10 Aug 2018 06:24:31 +0000 (16:24 +1000)]
Travis: add a missing macOS asciidoc dependency
teor [Fri, 10 Aug 2018 02:33:51 +0000 (12:33 +1000)]
Travis: put distcheck first for readability
teor [Fri, 10 Aug 2018 02:10:56 +0000 (12:10 +1000)]
Changes file for Travis: enable macOS builds
teor [Fri, 10 Aug 2018 01:54:26 +0000 (11:54 +1000)]
Rust: use a consistent working directory in builds and tests
cd to ${abs_top_builddir}/src/rust before running cargo in
src/test/test_rust.sh.
Fixes bug 26497; bugfix on 0.3.3.2-alpha.