cf04886c10
Merge branch 'maint-0.2.9' into release-0.2.9
2018-02-13 16:55:18 -05:00
f0ed7895ca
fix make check-changes
2018-02-13 15:07:55 -06:00
ff02ea65ec
Merge branch 'maint-0.2.9' into release-0.2.9
2018-02-13 08:50:58 -05:00
e658dad625
dirserv: Improve returned message when relay is rejected
...
Explicitly inform the operator of the rejected relay to set a valid email
address in the ContactInfo field and contact bad-relays@ mailing list.
Fixes #25170
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-02-13 08:47:42 -05:00
4f26c67d45
Merge branch 'maint-0.2.9' into release-0.2.9
2018-02-12 08:33:47 -05:00
e91bae66d8
Merge branch 'bug23318-redux_029' into maint-0.2.9
2018-02-12 08:33:03 -05:00
cb42f93a92
Merge branch 'maint-0.2.9' into release-0.2.9
2018-02-11 18:11:04 -05:00
84c13336c4
Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
2018-02-11 18:10:59 -05:00
27c30bc227
Merge branch 'maint-0.2.9' into release-0.2.9
2018-02-11 18:09:35 -05:00
848ba26c18
Merge branch 'ticket24315_029' into maint-0.2.9
2018-02-11 18:07:37 -05:00
da194bb490
Merge branch 'maint-0.2.9' into release-0.2.9
2018-02-11 16:51:56 -05:00
5dc785ceef
Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9
2018-02-11 16:51:53 -05:00
8901627616
Merge branch 'maint-0.2.9' into release-0.2.9
2018-02-10 16:09:00 -05:00
320dac4602
Merge branch 'bug24978_029_enable' into maint-0.2.9
2018-02-10 16:08:58 -05:00
90685b7603
Merge branch 'maint-0.2.9' into release-0.2.9
2018-02-08 10:29:05 -05:00
0ddc2dc531
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-02-08 10:29:05 -05:00
f1278b7e57
Update geoip and geoip6 to the February 7 2018 database.
2018-02-08 10:32:41 +01:00
0dbe3ddc33
Make Tor support TLS1.3 ciphers with OpenSSL 1.1.1
...
Without this patch, not only will TLS1.3 not work with Tor, but
OpenSSL 1.1.1 with TLS1.3 enabled won't build any connections at
all: It requires that either TLS1.3 be disabled, or some TLS1.3
ciphersuites be listed.
Closes ticket 24978.
2018-01-23 09:23:21 -05:00
401e70fba2
Merge branch 'maint-0.2.9' into release-0.2.9
2018-01-19 16:30:53 -05:00
490ae26b24
hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2
2018-01-19 16:13:54 -05:00
a15eb9ff43
MAX_REND_FAILURES is 1, but we would try three times
...
Fix an "off by 2" error in counting rendezvous failures on the onion
service side.
While we thought we would stop the rendezvous attempt after one failed
circuit, we were actually making three circuit attempts before giving up.
Fixes bug 24895; bugfix on 0.0.6.
2018-01-19 02:28:55 -05:00
e8fdac7755
Merge branch 'maint-0.2.9' into release-0.2.9
2018-01-08 11:10:36 -05:00
9464da210d
Add changes file for new fallback directory list.
2018-01-08 11:09:08 -05:00
b650191b9c
Merge branch 'maint-0.2.9' into release-0.2.9
2018-01-08 09:34:56 -05:00
26e28829da
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-01-08 09:34:56 -05:00
8efbeb0982
Update geoip and geoip6 to the January 5 2018 database.
2018-01-08 11:36:38 +01:00
74842cce63
Merge branch 'maint-0.2.9' into release-0.2.9
2018-01-05 16:41:34 -05:00
c52d4d9e34
Merge branch 'teor_ticket24681_028' into maint-0.2.9
2018-01-05 16:41:31 -05:00
68ca6d2e19
Don't treat a setrlimit failure as fatal.
...
Fixes bug 21074; bugfix on 4689243242
2018-01-04 13:21:29 -05:00
45a93ac807
Merge branch 'maint-0.2.9' into release-0.2.9
2018-01-03 08:59:59 -05:00
c9b3f6352f
Merge branch 'bug24633_029' into maint-0.2.9
2018-01-03 08:59:52 -05:00
b2871cef91
Merge branch 'maint-0.2.9' into release-0.2.9
2018-01-02 10:10:28 -05:00
6e5e4f92ab
Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
2018-01-02 10:09:44 -05:00
09b9a35c07
Clear the address when we can't choose a reachable address
...
When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.
This is a precautionary measure, because some callers do not check the
return value.
Fixes bug 24736; bugfix on 0.2.8.2-alpha.
2017-12-25 01:55:28 +11:00
30e1371675
Make the default DirAuthorityFallbackRate 0.1
...
This makes clients on the public tor network prefer to bootstrap off fallback
directory mirrors.
This is a follow-up to 24679, which removed weights from the default fallbacks.
Implements ticket 24681.
2017-12-23 00:01:31 +11:00
cbe36a7398
Merge branch 'maint-0.2.9' into release-0.2.9
2017-12-21 10:58:20 -05:00
3b08184338
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-21 10:43:12 -05:00
7d845976e3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-21 10:43:06 -05:00
9202087760
Merge branch 'bug24666_squashed_025' into maint-0.2.5
2017-12-21 10:40:10 -05:00
520cf21793
Move destroy cells into a separate queue type of their own, to save RAM
...
We've been seeing problems with destroy cells queues taking up a
huge amount of RAM. We can mitigate this, since while a full packed
destroy cell takes 514 bytes, we only need 5 bytes to remember a
circuit ID and a reason.
Fixes bug 24666. Bugfix on 0.2.5.1-alpha, when destroy cell queues
were introduced.
2017-12-21 10:29:01 -05:00
bf8984a036
Merge branch 'maint-0.2.9' into release-0.2.9
2017-12-20 12:15:23 -05:00
c604a76a53
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-20 12:15:23 -05:00
877dd1d6c8
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-20 12:15:23 -05:00
428f8a375b
Update geoip and geoip6 to the December 6 2017 database.
2017-12-20 17:36:29 +01:00
accd0ea65b
Fix the clz32 and clz64 settings on MSVC.
...
Fixes bug 24633; bugfix on 0.2.9.1-alpha.
2017-12-20 09:37:18 -05:00
06f1bb5954
Merge branch 'maint-0.2.9' into release-0.2.9
2017-12-11 16:56:31 -05:00
eecfed0cd2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:56:31 -05:00
f7151387d9
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:56:31 -05:00
1deda2106b
Merge branch 'bug24167_025' into maint-0.2.5
2017-12-11 16:56:28 -05:00
473725a63d
Merge branch 'maint-0.2.9' into release-0.2.9
2017-12-11 16:54:14 -05:00
Nick Mathewson
Taylor Yu
David Goulet
Karsten Loesing
Roger Dingledine
teor