0af0f78dff
Merge branch 'maint-0.3.5'
2018-12-18 13:52:39 -05:00
702fd6f0f2
Merge branch 'ticket28881_035' into maint-0.3.5
2018-12-18 13:52:36 -05:00
4894d44ab8
Always initialize addr in parse_port_config()
...
It was always analyzed before use, but scan-build wasn't able to
persuade itself of that.
Closes ticket 28881.
2018-12-18 13:52:25 -05:00
a3e6f2467b
Merge remote-tracking branch 'tor-github/pr/595'
2018-12-18 13:51:21 -05:00
872998dd00
Merge branch 'ticket28179_squashed_merged'
2018-12-18 13:36:34 -05:00
44a80bb361
Add missing changes files for #26360 , #28179 , #28180 .
...
See: https://bugs.torproject.org/26179
See: https://bugs.torproject.org/28180
See: https://bugs.torproject.org/28360
2018-12-18 13:36:08 -05:00
90187b1bfc
Remove changes that are already merged in 0.3.5.x releases
2018-12-18 08:15:38 -05:00
c61cd5775c
Revert "Log bootstrap tag names"
...
This reverts commit 1b855af5e3
2018-12-18 08:09:43 -05:00
5a22b42c3a
Merge branch 'maint-0.3.5'
2018-12-17 10:57:51 -05:00
1a9a9fc0ff
Changes file for 28562
2018-12-17 10:57:47 -05:00
06046c726f
Add changes file for <30min HeartbeatPeriod patch
2018-12-14 09:24:19 -05:00
f8dac5c900
Merge branch 'maint-0.3.5'
2018-12-13 19:01:29 -05:00
94a7998158
Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5
2018-12-13 18:57:00 -05:00
69264f96f3
Merge branch 'dormant_persist_squashed'
2018-12-13 08:26:10 -05:00
c037bf5817
changes file for ticket26864
2018-12-13 08:25:54 -05:00
91be6a77e9
Merge remote-tracking branch 'teor/ticket24838'
2018-12-11 10:04:16 -05:00
b2625b09f1
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-11 10:00:22 -05:00
1983426073
Merge branch 'maint-0.3.5'
2018-12-11 10:00:22 -05:00
633813e313
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-11 10:00:22 -05:00
93019b4787
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 10:00:22 -05:00
3b5188576f
Note ticket number in changes file for 24803
2018-12-11 10:00:19 -05:00
b915b6cd21
Merge remote-tracking branch 'github/prop297'
2018-12-11 09:44:57 -05:00
e1273d7d1b
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-11 09:41:05 -05:00
6506b1ee9f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-11 09:41:05 -05:00
27e4269929
Merge branch 'maint-0.3.5'
2018-12-11 09:41:05 -05:00
c1f9191581
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 09:41:04 -05:00
58d2ced572
Merge remote-tracking branch 'teor/24805-phoul'
2018-12-11 09:38:27 -05:00
ce501a529f
Merge remote-tracking branch 'catalyst-github/ticket27402'
2018-12-11 09:37:41 -05:00
b65166750d
Merge remote-tracking branch 'rl1987/ticket28007_take2'
2018-12-11 09:25:46 -05:00
c4c372f281
Merge remote-tracking branch 'rl1987/ticket28551'
2018-12-11 09:24:35 -05:00
1b855af5e3
Log bootstrap tag names
...
Add the bootstrap tag name to the log messages, so people
troubleshooting connection problems can look up a symbol instead of a
number. Closes ticket 28731.
2018-12-10 17:22:28 -06:00
4991b29311
Fallbacks: Update the hard-coded fallback list in December 2018
...
Merge Phoul's two lists into teor's list.
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
157 fallbacks (92 new, 65 existing, 85 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-10 17:02:19 +10:00
d9b9c1fa76
Changes file for 24805
2018-12-07 17:04:50 +10:00
78e177d622
Fallbacks: Update the hard-coded fallback list in December 2018
...
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
148 fallbacks (89 new, 59 existing, 91 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-07 16:43:10 +10:00
6bc5c06dc2
Fallbacks: accept relays that are a fuzzy match to the whitelist
...
If a relay matches at least one fingerprint, IPv4 address, or IPv6
address in the fallback whitelist, it can become a fallback. This
reduces the work required to keep the list up to date.
Closes ticket 28768.
2018-12-07 16:30:24 +10:00
c3fe405e21
Fallbacks: use a 24 hour future consensus tolerance
...
Tor clients on 0.3.5.6-rc? and later will use a consensus that will become
valid up to 24 hours in the future.
Clients on 0.3.5.5-alpha? and earlier won't accept future consensuses.
Update the fallback expiry tolerance to match tor's checks.
Part of 28768, follow-up on 28591.
2018-12-07 15:54:32 +10:00
766fd6cf76
Fallbacks: use a 24 hour consensus expiry tolerance
...
Tor clients will use a consensus that expired up to 24 hours ago.
Clients on 0.3.5.5-alpha? and earlier won't select guards from an expired
consensus, but they can still bootstrap if they have existing guards.
Update the fallback expiry tolerance to match tor's checks.
Part of 28768, follow-up on 24661.
2018-12-07 15:54:32 +10:00
2ccb9e9444
Merge branch 'maint-0.3.5'
2018-12-06 09:26:34 -05:00
c1f86f7492
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-06 09:26:33 -05:00
c4f7953d8b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-12-06 09:26:32 -05:00
00341d97f3
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-06 09:26:32 -05:00
ecaecaddd8
Add changes file
2018-12-06 15:31:33 +02:00
57798eb1cb
Update geoip and geoip6 to the December 5 2018 database.
2018-12-05 21:02:39 +01:00
46a321fbdd
Merge branch 'maint-0.3.5'
2018-12-05 10:25:12 -05:00
967efc0d28
Merge remote-tracking branch 'tor-github/pr/546' into maint-0.3.5
2018-12-05 10:23:28 -05:00
1eb3719a62
Merge remote-tracking branch 'public/prop298'
2018-12-05 09:43:03 -05:00
1f95e80351
Merge branch 'prop293_squashed'
2018-12-05 09:24:51 -05:00
d4f558e385
Merge remote-tracking branch 'tor-github/pr/531'
2018-12-05 09:02:49 -05:00
4002a84ffe
Merge remote-tracking branch 'tor-github/pr/561'
2018-12-05 08:29:41 -05:00
ca4b86f90a
Merge remote-tracking branch 'tor-github/pr/508'
2018-12-05 08:19:02 -05:00
Nick Mathewson
Alexander Færøy
Matt Traudt
Taylor Yu
teor
rl1987
Karsten Loesing