Commit Graph

35693 Commits

Author SHA1 Message Date
Nick Mathewson 78bbbd9035 Merge branch 'maint-0.4.4' into release-0.4.4 2020-07-13 10:45:04 -04:00
Nick Mathewson eb427f309c Changes file for ticket 31812. 2020-07-13 10:44:39 -04:00
JeremyRand 0be80fb650 Bug 31812: Change http URL's to https 2020-07-13 10:42:46 -04:00
Nick Mathewson aaf8165cd1 Merge branch 'maint-0.4.4' into release-0.4.4 2020-07-09 13:16:00 -04:00
Nick Mathewson 20e2787352 Bump to 0.4.4.2-alpha-dev 2020-07-09 13:15:45 -04:00
Nick Mathewson eb6fc9f9bd Merge branch 'maint-0.4.3' into maint-0.4.4
`-s ours` to avoid version bump.
2020-07-09 13:15:23 -04:00
Nick Mathewson 3517d20322 Bump to 0.4.3.6-dev 2020-07-09 13:15:15 -04:00
Nick Mathewson 42c0358ceb Merge branch 'maint-0.4.2' into maint-0.4.3
`-s ours` to avoid version bump.
2020-07-09 13:14:58 -04:00
Nick Mathewson 49b4d1765c Bump to 0.4.2.8-dev 2020-07-09 13:14:48 -04:00
Nick Mathewson 6e01d5e685 Merge branch 'maint-0.3.5' into maint-0.4.2
`-s ours` to avoid version bump.
2020-07-09 13:14:22 -04:00
Nick Mathewson c9751e2611 Bump to 0.3.5.11-dev 2020-07-09 13:12:45 -04:00
Nick Mathewson 50b503a9f9 Merge branch 'maint-0.4.4' into release-0.4.4 tor-0.4.4.2-alpha 2020-07-09 10:32:39 -04:00
Nick Mathewson 3efd604743 Update version to 0.4.4.2-alpha. 2020-07-09 10:31:55 -04:00
Nick Mathewson f9f4c4ab1d Merge branch 'maint-0.4.3' into maint-0.4.4
`-s ours` to avoid version bump.
2020-07-09 10:31:16 -04:00
Nick Mathewson 7ba849349a Update version to 0.4.3.6. 2020-07-09 10:31:09 -04:00
Nick Mathewson 70161785f9 Merge branch 'maint-0.4.2' into maint-0.4.3
`-s ours` to avoid version bump.
2020-07-09 10:30:46 -04:00
Nick Mathewson 5aaecf6d07 Update version to 0.4.2.8. 2020-07-09 10:30:37 -04:00
Nick Mathewson 78285594f5 Merge branch 'maint-0.3.5' into maint-0.4.2
`-s ours` to avoid version bump.
2020-07-09 10:30:03 -04:00
Nick Mathewson 0bb227d170 bump to 0.3.5.11 2020-07-09 10:28:21 -04:00
Nick Mathewson dfddfa833b More changelog folding 2020-07-09 10:12:18 -04:00
George Kadianakis 7bc4afdd96 Merge branch 'maint-0.4.4' into release-0.4.4 2020-07-09 17:08:34 +03:00
George Kadianakis e500ea2eae Merge branch 'tor-github/pr/1989' into maint-0.4.4 2020-07-09 17:08:07 +03:00
Nick Mathewson 3a5c9487d7 fold in changelog entry for 33796 2020-07-09 10:06:41 -04:00
Nick Mathewson ff38a077e1 Merge branch 'maint-0.4.4' into release-0.4.4 2020-07-09 09:59:54 -04:00
Nick Mathewson 8dd89e4330 Merge remote-tracking branch 'dgoulet/ticket33796_044_01' into maint-0.4.4 2020-07-09 09:59:45 -04:00
Nick Mathewson 781dd1bd8a Fold in more changelog entries, hope to finish changelog 2020-07-09 09:46:53 -04:00
Nick Mathewson af08dad6d1 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-07-09 09:28:53 -04:00
Nick Mathewson 283ce30c53 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-07-09 09:28:53 -04:00
Nick Mathewson 0f39cc10f6 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-07-09 09:28:53 -04:00
Nick Mathewson 3325587572 Merge branch 'maint-0.4.4' into release-0.4.4 2020-07-09 09:28:53 -04:00
Nick Mathewson 7142f3e435 Merge branch 'trove_2020_001_035' into maint-0.3.5 2020-07-09 09:28:36 -04:00
David Goulet 63a54858c3 hs-v3: Remove a possible BUG() condition
When receiving an introduction NACK, the client either decides to close or
re-extend the circuit to another intro point.

In order to do this, the service descriptor needs to exists but it is possible
that it gets removed from the cache between the establishement of the
introduction circuit and the reception of the (N)ACK.

For that reason, the BUG(desc == NULL) is removed because it is a possible
normal use case. Tor recovers gracefully already.

Fixes #34087

Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-09 08:32:53 -04:00
David Goulet d4fde97de2 Merge branch 'maint-0.4.4' into release-0.4.4 2020-07-09 07:27:25 -04:00
David Goulet 1af7f40dad Merge branch 'tor-github/pr/1988' into maint-0.4.4 2020-07-09 07:27:13 -04:00
David Goulet 990ae1b027 Merge branch 'maint-0.4.4' into release-0.4.4 2020-07-09 07:25:26 -04:00
George Kadianakis c1598be1e0 Refactor setup_intro_circ_auth_key() to make it simpler.
It now uses the 'goto err' pattern, instead of the fatal_unreached()
pattern. The latter pattern is usually used when there is a loop, but there is
no loop in this function so it can be simplified easily.
2020-07-09 10:40:56 +03:00
George Kadianakis e0da64fd27 Handle a failure edge-case when a client-side intro circ opens. 2020-07-09 10:10:57 +03:00
Guinness 562957e0db socks: Returns 0xF6 only if BAD_HOSTNAME
This commit modifies the behavior of `parse_extended_address` in such a way
that if it fails, it will always return a `BAD_HOSTNAME` value, which is then
used to return the 0xF6 extended error code.  This way, in any case that is
not a valid v2 address, we return the 0xF6 error code, which is the expected
behavior.

Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-08 16:20:31 -04:00
Alexander Færøy c364e0e83b Merge branch 'maint-0.4.2' into maint-0.4.3 2020-07-08 00:36:48 +00:00
Alexander Færøy d973604981 Merge branch 'maint-0.4.4' into release-0.4.4 2020-07-08 00:36:48 +00:00
Alexander Færøy 9603d8af0b Merge branch 'maint-0.4.3' into maint-0.4.4 2020-07-08 00:36:48 +00:00
Alexander Færøy b81e24cda6 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-07-08 00:36:47 +00:00
Nick Mathewson 3e08dd9df1 Resolve a compiler warning from a 32-bit signed/unsigned comparison
This warning only affects platforms (like win32) with 32-bit time_t.

Fixes bug 40028; bugfix on 0.3.2.8-rc.
2020-07-07 15:05:38 -04:00
David Goulet 66d5292ee6 Revert "config: Make clients tell dual-stack exits they prefer IPv6"
This reverts commit bf2a399fc0.

Don't set by default the prefer IPv6 feature on client ports because it breaks
the torsocks use case. The SOCKS resolve command is lacking a mechanism to ask
for a specific address family (v4 or v6) thus prioritizing IPv6 when an IPv4
address is asked on the resolve SOCKS interface resulting in a failure.

Tor Browser explicitly set PreferIPv6 so this should not affect the majority
of our users.

Closes #33796

Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-07 12:58:41 -04:00
Alexander Færøy a213d27938 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-07-07 14:48:36 +00:00
Alexander Færøy 80ae7d305a Merge branch 'maint-0.4.4' into release-0.4.4 2020-07-07 14:48:36 +00:00
Alexander Færøy d4c79cae76 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-07-07 14:48:36 +00:00
Alexander Færøy 19d579e8cb Merge branch 'maint-0.3.5' into maint-0.4.2 2020-07-07 14:48:35 +00:00
David Goulet d9cc2b2928 CI: Fix Appveyor printf format error
For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.

Fixes #40026
2020-07-07 09:53:54 -04:00
Nick Mathewson 9c0e3e573e minor changelog edits 2020-07-06 16:42:12 -04:00