2734968e40
Bug 19859: Add stream isolation data to STREAM event
2019-10-27 01:32:21 +00:00
e7993dc046
Merge branch 'ticket31241_v3'
2019-10-25 08:10:39 -04:00
f40eb2ead6
Merge remote-tracking branch 'tor-github/pr/1462'
2019-10-25 16:14:37 +10:00
9be0324c2c
changes: file for 31919
2019-10-25 16:08:44 +10:00
aff286618c
Merge branch 'maint-0.4.2'
2019-10-25 10:56:21 +10:00
d7c40beeab
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-25 10:56:13 +10:00
63581d55a6
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-25 10:56:06 +10:00
e56e7e865e
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-25 10:55:58 +10:00
e03db9934a
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-25 10:55:51 +10:00
a91f52a443
Merge branch 'maint-0.4.2'
2019-10-25 10:38:22 +10:00
94853b4ab6
changes tile for ticket 31241
2019-10-24 20:38:02 -04:00
c8aa3cc17d
Merge remote-tracking branch 'tor-github/pr/1466' into maint-0.4.2
2019-10-25 10:38:01 +10:00
b3d035d5c4
Merge remote-tracking branch 'tor-github/pr/1463'
2019-10-25 10:27:41 +10:00
93be7275ec
changes: file for 31919's bionic Travis image change
2019-10-25 09:53:11 +10:00
c00602cc34
Merge branch 'maint-0.4.2'
2019-10-25 09:42:14 +10:00
acd27f4b41
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2
2019-10-25 09:41:48 +10:00
fefee871a6
Merge remote-tracking branch 'tor-github/pr/1437'
2019-10-24 11:44:19 -04:00
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
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
fcdb66acd3
Add a script to rename C identifiers, and optionally add a commit message
...
This script should "pay for itself" if it prevents one bug caused by
careless search-replace-commit loops.
2019-10-24 08:20:31 -04:00
20606b8a15
Merge remote-tracking branch 'tor-github/pr/1447'
2019-10-24 10:00:47 +10:00
9586ae178a
Merge branch 'tor-github/pr/1451'
2019-10-23 09:11:43 -04:00
34509e78c6
Merge remote-tracking branch 'tor-github/pr/1449'
2019-10-23 22:59:16 +10:00
226f11002d
changes: file for 32216
2019-10-23 13:36:39 +10:00
d804a81cf1
changes: file for 29603
...
We merged this change without a changes file.
2019-10-23 12:26:32 +10:00
8bc65cda44
Merge branch 'pr1450_squashed' into maint-0.4.1
2019-10-23 09:58:22 +10:00
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
9db1602ec5
Merge branch 'maint-0.4.2'
2019-10-23 08:47:30 +10:00
4a5c909ce5
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-23 08:47:15 +10:00
57acdaa3f1
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-23 08:47:08 +10:00
641f130447
Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0
2019-10-23 08:35:17 +10:00
c77162e4e9
Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5
2019-10-23 08:32:52 +10:00
8682442c76
Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9
2019-10-23 08:32:22 +10:00
27965f1ef2
Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5
2019-10-23 08:30:48 +10:00
003be727c4
Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5
2019-10-23 08:28:03 +10:00
7660a7cf7d
Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9
2019-10-23 08:20:45 +10:00
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
1cdc030c3d
Merge branch 'maint-0.4.2'
2019-10-22 14:47:28 -04:00
2ed194c9a9
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
2019-10-22 14:46:10 -04:00
04addabb04
Changes file for options_validate() API changes in #32187 .
2019-10-22 14:24:09 -04:00
91413e04b4
Remove changes files that are already merged in 0.4.2.
2019-10-22 13:01:25 -04:00
3c071f3002
Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1
2019-10-22 12:54:37 -04:00
d08d29f15f
Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1
2019-10-22 12:53:06 -04:00
7d75e1dbdf
Merge remote-tracking branch 'tor-github/pr/1446'
2019-10-22 12:52:32 -04:00
b588b60876
Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1
2019-10-22 12:51:27 -04:00
9769df89fe
Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1
2019-10-22 12:15:06 -04:00
c1bf4260b6
Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1
2019-10-22 12:13:47 -04:00
d4dde249a0
Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1
2019-10-22 12:11:50 -04:00
4013e50cb7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-22 12:10:30 -04:00
6965798a16
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-22 12:10:30 -04:00
JeremyRand
Nick Mathewson
teor
David Goulet
Roger Dingledine