84e9060f4d
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-25 09:42:10 +10:00
acd27f4b41
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2
2019-10-25 09:41:48 +10:00
e73fb5b0e9
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-24 15:55:51 -04:00
570d1367ea
bump to 0.4.2.3-alpha-dev
2019-10-24 15:55:22 -04:00
80bfc47198
final (?) changelog edits for 0.4.2.3-alpha
2019-10-24 13:28:19 -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
bb54bca875
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-23 20:26:32 -04:00
76939cf293
Bump to 0.4.2.3-alpha
2019-10-23 20:25:34 -04:00
a1b8ff6821
fold two more changelog entries into 0423-alpha cl
2019-10-23 20:24:03 -04:00
a822bf291e
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-23 10:00:45 +10:00
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
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
53c4068e80
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-23 08:47:27 +10:00
b45048feaf
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-23 08:47:23 +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
d175e70817
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-23 08:47:01 +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
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
7660a7cf7d
Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9
2019-10-23 08:20:45 +10:00
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
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
443df7e0d2
Merge branch 'maint-0.4.2' into release-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
869e15cbf4
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-22 12:54:44 -04:00
edc3f70635
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:54:43 -04:00
3c071f3002
Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1
2019-10-22 12:54:37 -04:00
fb610c9a23
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-22 12:53:12 -04:00
5ddc04f49d
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:53:12 -04:00
d08d29f15f
Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1
2019-10-22 12:53:06 -04:00
796f1d8b75
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-22 12:51:33 -04:00
730f0e3da3
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:51:33 -04:00
b588b60876
Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1
2019-10-22 12:51:27 -04:00
24d8b931d0
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-22 12:15:14 -04:00
9537966a0b
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:15:14 -04:00
9769df89fe
Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1
2019-10-22 12:15:06 -04:00
2d8b4f9c48
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-22 12:13:56 -04:00
c55c75bc97
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:13:55 -04:00
c1bf4260b6
Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1
2019-10-22 12:13:47 -04:00
6f3ee65f53
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-22 12:11:59 -04:00
34f3d8d407
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:11:59 -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
11b1e1715e
Merge branch 'maint-0.4.2' into release-0.4.2
2019-10-22 12:10:30 -04:00
e5b9eefb02
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-22 12:10:30 -04:00
teor
Nick Mathewson
David Goulet
Philipp Winter
Roger Dingledine