Commit Graph

33674 Commits

Author SHA1 Message Date
teor 8f8e1523e0 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-25 10:56:17 +10:00
teor d7c40beeab Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-25 10:56:13 +10:00
teor 63581d55a6 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-25 10:56:06 +10:00
teor e56e7e865e Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-25 10:55:58 +10:00
teor e03db9934a Merge branch 'maint-0.2.9' into maint-0.3.5 2019-10-25 10:55:51 +10:00
teor 4469128545 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-25 10:38:18 +10:00
teor c8aa3cc17d Merge remote-tracking branch 'tor-github/pr/1466' into maint-0.4.2 2019-10-25 10:38:01 +10:00
teor 93be7275ec changes: file for 31919's bionic Travis image change 2019-10-25 09:53:11 +10:00
teor 1eb57b20b9 Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035 2019-10-25 09:48:14 +10:00
teor 8e549dd562 Travis: Use Ubuntu Bionic, but keep Trusty for chutney
Bionic has a recent coccinelle version, which passes our CI tests.

But Bionic (and Xenial) cause permissions errors for chutney.
We'll fix those in 32240.

Part of 31919.
2019-10-25 09:45:36 +10:00
teor 84e9060f4d Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-25 09:42:10 +10:00
teor acd27f4b41 Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2 2019-10-25 09:41:48 +10:00
Nick Mathewson e73fb5b0e9 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-24 15:55:51 -04:00
Nick Mathewson 570d1367ea bump to 0.4.2.3-alpha-dev 2019-10-24 15:55:22 -04:00
Nick Mathewson 80bfc47198 final (?) changelog edits for 0.4.2.3-alpha tor-0.4.2.3-alpha 2019-10-24 13:28:19 -04:00
David Goulet 3867ca4925 dir: Return 503 code when rejecting single hop request
Single hop rejection (POST and GET) for HS v3 descriptor now return a 503 code
which is more accurate code from dir-spec.txt and from other rejection case in
the code.

For instance if you are not a relay and you get a POST request, a 503 code is
sent back with a rejection message.

Part of #31958

Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-24 11:25:05 -04:00
David Goulet 985717675c dir: Remove connection_dir_is_anonymous() logging
First, remove the HSDir mention which should not be in that generic function.
Second, move them to debug() level since they are possible error case.

Part of #31958

Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-24 11:23:31 -04:00
David Goulet 09468cc58b dir: Look if circuit is closed in connection_dir_is_anonymous()
Before inspecting the p_chan, we must check if the circuit is marked for close
because if it is the case, the channels are nullified from the circuit.

Several valid cases can mark the circuit for close of the directory
connection.

Fixes #31958

Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-24 11:08:25 -04:00
David Goulet ed57a04a65 hs-v3: Remove a BUG() caused by an acceptable race
hs_client_purge_state() and hs_cache_clean_as_client() can remove a descriptor
from the client cache with a NEWNYM or simply when the descriptor expires.

Which means that for an INTRO circuit being established during that time, once
it opens, we lookup the descriptor to get the IP object but hey surprised, no
more descriptor.

The approach here is minimalist that is accept the race and close the circuit
since we can not continue. Before that, the circuit would stay opened and the
client wait the SockTimeout.

Fixers #28970.

Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-24 08:50:01 -04:00
Nick Mathewson bb54bca875 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-23 20:26:32 -04:00
Nick Mathewson 76939cf293 Bump to 0.4.2.3-alpha 2019-10-23 20:25:34 -04:00
Nick Mathewson a1b8ff6821 fold two more changelog entries into 0423-alpha cl 2019-10-23 20:24:03 -04:00
teor a822bf291e Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-23 10:00:45 +10:00
teor 65545e1345 Merge branch 'maint-0.4.1' into maint-0.4.2
`git merge --strategy ours` to use STATIC for unit tests in
maint-0.4.2.
2019-10-23 09:59:07 +10:00
teor 8bc65cda44 Merge branch 'pr1450_squashed' into maint-0.4.1 2019-10-23 09:58:22 +10:00
Nick Mathewson f3c0a0b9fe Authorities reject relays running unsupported Tor release series.
Our minimum version is now 0.2.9.5-alpha.  Series 0.3.0, 0.3.1,
0.3.2, 0.3.3, and 0.3.4 are now rejected.

Also, extract this version-checking code into a new function, so we
can test it.

Closes ticket 31549.

Also reject 0.3.5.0 through 0.3.5.6-rc as unstable.
2019-10-23 09:57:51 +10:00
teor 53c4068e80 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-23 08:47:27 +10:00
teor b45048feaf Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-23 08:47:23 +10:00
teor 4a5c909ce5 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-23 08:47:15 +10:00
teor 57acdaa3f1 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-23 08:47:08 +10:00
teor d175e70817 Merge branch 'maint-0.2.9' into maint-0.3.5 2019-10-23 08:47:01 +10:00
teor 641f130447 Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0 2019-10-23 08:35:17 +10:00
teor c77162e4e9 Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5 2019-10-23 08:32:52 +10:00
teor 8682442c76 Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9 2019-10-23 08:32:22 +10:00
teor 27965f1ef2 Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5 2019-10-23 08:30:48 +10:00
teor 003be727c4 Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5 2019-10-23 08:28:03 +10:00
teor 1ea19d7a5b Merge branch 'maint-0.2.9' into maint-0.3.5
`git merge --strategy ours` to take the 0.3.5 changes for 31001,
and ignore the conflicting 0.2.9 changes.
2019-10-23 08:25:42 +10:00
teor 7660a7cf7d Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9 2019-10-23 08:20:45 +10:00
Philipp Winter 80a198928e Remove outdated note.
BridgeDB supports bridge-distribution lines since version 0.5.0:
<https://bugs.torproject.org/23957>
2019-10-23 07:52:05 +10:00
Roger Dingledine 4233fb7014 clarify in man page: we count by powers of two
Make clear in the man page, in both the bandwidth section and the
accountingmax section, that Tor counts in powers of two, not
powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion
bytes.

Resolves ticket 32106.
2019-10-23 07:50:20 +10:00
Nick Mathewson 443df7e0d2 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 14:47:28 -04:00
Nick Mathewson 2ed194c9a9 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2 2019-10-22 14:46:10 -04:00
Nick Mathewson 869e15cbf4 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:54:44 -04:00
Nick Mathewson edc3f70635 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:54:43 -04:00
Nick Mathewson 3c071f3002 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1 2019-10-22 12:54:37 -04:00
Nick Mathewson fb610c9a23 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:53:12 -04:00
Nick Mathewson 5ddc04f49d Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:53:12 -04:00
Nick Mathewson d08d29f15f Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1 2019-10-22 12:53:06 -04:00
Nick Mathewson 796f1d8b75 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:51:33 -04:00
Nick Mathewson 730f0e3da3 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:51:33 -04:00