Nick Mathewson
86583ad78e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-10 16:09:00 -05:00
Nick Mathewson
320dac4602
Merge branch 'bug24978_029_enable' into maint-0.2.9
2018-02-10 16:08:58 -05:00
Nick Mathewson
04a8e81fa9
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-08 10:29:05 -05:00
Nick Mathewson
0ddc2dc531
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-02-08 10:29:05 -05:00
Karsten Loesing
f1278b7e57
Update geoip and geoip6 to the February 7 2018 database.
2018-02-08 10:32:41 +01:00
Nick Mathewson
9cbc40e376
Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1
2018-02-01 15:28:11 -05:00
Nick Mathewson
5fc0437e74
But in most Earth cultures, there are 60s in a minute.
2018-01-31 10:06:43 -05:00
Nick Mathewson
86e6cb6409
add a rate-limit.
2018-01-31 10:01:10 -05:00
teor
9656ad3232
Changes file for 25070
2018-01-30 02:08:42 +11:00
teor
a8e5e3a492
Add Link protocol version 5 to the supported protocols list in protover.c
...
Part of #25070 , bugfix on 0.3.1.1-alpha.
2018-01-30 01:56:50 +11:00
Nick Mathewson
9c2bc441f8
If out-of-disk when saving a consensus cache entry, don't BUG.
...
Just warn instead.
Fixes bug 24859.
2018-01-26 13:14:14 -05:00
Nick Mathewson
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
Nick Mathewson
7f2e23e7ac
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid maint-0.3.0's version of 24895.
2018-01-19 16:30:12 -05:00
Nick Mathewson
00a42277ea
Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1
2018-01-19 16:30:02 -05:00
Nick Mathewson
b39c50cde8
Merge branch 'maint-0.2.9' into maint-0.3.0
...
Conflicts:
src/or/rendservice.c
2018-01-19 16:29:43 -05:00
Nick Mathewson
a2aaf9509b
Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9
2018-01-19 16:29:15 -05:00
David Goulet
f98f7ca898
Merge branch 'bug24895_029_02' into bug24895_031_02
2018-01-19 16:21:55 -05:00
Roger Dingledine
490ae26b24
hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2
2018-01-19 16:13:54 -05:00
Nick Mathewson
483a59ec2a
Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1
2018-01-19 10:18:21 -05:00
Nick Mathewson
9b19e33bed
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid 0.2.5 version of #24863 fix.
2018-01-19 10:17:33 -05:00
Nick Mathewson
1cf11b6940
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-19 10:17:05 -05:00
Nick Mathewson
36567c5ca4
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-01-19 10:16:47 -05:00
Roger Dingledine
cc5a9e9667
turn MAX_REND_FAILURES into a function
...
no actual changes in behavior
2018-01-19 02:38:07 -05:00
Roger Dingledine
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
Nick Mathewson
f406b9df05
Merge branch 'bug24826_031' into maint-0.3.1
2018-01-18 08:13:45 -05:00
Taylor Yu
0e7f1b06e9
Work around Travis CI ptrace regression
...
Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly. Set "sudo: required" to force non-container builds for
clang and work around this.
2018-01-17 14:10:04 -06:00
Taylor Yu
49de586add
Work around Travis CI ptrace regression
...
Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly. Set "sudo: required" to force non-container builds for
clang and work around this.
2018-01-17 13:40:34 -06:00
Nick Mathewson
4bb831e087
Improve fragile-hardening performance of consensus_split_lines.
...
For whatever reason, in my testing, using memchr() here improves
performance over strchr() by a great deal.
Fixes bug 24826; bugfix on 0.3.1.1-alpha.
2018-01-16 12:42:40 -05:00
Roger Dingledine
af8cadf3a9
Remove false positives from channel_is_client()
...
Fix a set of false positives where relays would consider connections
to other relays as being client-only connections (and thus e.g.
deserving different link padding schemes) if those relays fell out
of the consensus briefly.
Now we look only at the initial handshake and whether the connection
authenticated as a relay.
Fixes bug 24898; bugfix on 0.3.1.1-alpha.
2018-01-15 22:33:40 -05:00
Nick Mathewson
b85fa0bd5f
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-08 11:10:36 -05:00
Nick Mathewson
e3ab27001f
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-08 11:10:36 -05:00
Nick Mathewson
9464da210d
Add changes file for new fallback directory list.
2018-01-08 11:09:08 -05:00
Nick Mathewson
a42e52dded
Add 7 other fallback dirs from teor's tests
...
These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc"
2018-01-08 11:03:44 -05:00
Nick Mathewson
491c09c19a
Update the fallback_dirs.inc file: part 1
...
This takes the updated fallback_dirs_2018_01_06_CA.inc from
pastly's scan.
2018-01-08 10:57:06 -05:00
Nick Mathewson
a1ce1ab201
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-08 09:34:57 -05:00
Nick Mathewson
8042c356f4
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-08 09:34:56 -05:00
Nick Mathewson
26e28829da
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-01-08 09:34:56 -05:00
Karsten Loesing
8efbeb0982
Update geoip and geoip6 to the January 5 2018 database.
2018-01-08 11:36:38 +01:00
Nick Mathewson
48d94e290d
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-05 16:41:34 -05:00
Nick Mathewson
16fd975a82
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-05 16:41:34 -05:00
Nick Mathewson
c52d4d9e34
Merge branch 'teor_ticket24681_028' into maint-0.2.9
2018-01-05 16:41:31 -05:00
Nick Mathewson
94d5523c7f
fix a wide line
2018-01-05 11:28:23 -05:00
Nick Mathewson
c1d98c75e3
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-03 08:59:59 -05:00
Nick Mathewson
bbc9ff160e
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-03 08:59:59 -05:00
Nick Mathewson
c9b3f6352f
Merge branch 'bug24633_029' into maint-0.2.9
2018-01-03 08:59:52 -05:00
Nick Mathewson
fb5877b972
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-02 10:10:28 -05:00
Nick Mathewson
8a7767603a
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-02 10:10:28 -05:00
Nick Mathewson
6e5e4f92ab
Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
2018-01-02 10:09:44 -05:00
teor
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
teor
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