Alexander Færøy
38f3cf4103
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 14:03:04 +00:00
Alexander Færøy
c9c4a3d0f6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 14:03:04 +00:00
David Goulet
faba6909f8
test: Rename function to be IPv4 specific
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-30 09:56:14 -04:00
Alexander Færøy
8444fbe904
Merge branch 'tor-github/pr/1793' into maint-0.3.5
2020-06-30 13:55:39 +00:00
Alexander Færøy
aced9be224
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 13:48:49 +00:00
Alexander Færøy
be7386a654
Merge branch 'maint-0.4.4'
2020-06-30 13:48:49 +00:00
Alexander Færøy
2042ebe88e
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 13:48:49 +00:00
Alexander Færøy
483082b57b
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:48:49 +00:00
Alexander Færøy
c3ad2a1d23
Merge branch 'tor-github/pr/1785' into maint-0.3.5
2020-06-30 13:47:55 +00:00
Alexander Færøy
21cf91ee2c
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 13:37:20 +00:00
Alexander Færøy
9e4b47233b
Merge branch 'maint-0.4.4'
2020-06-30 13:37:20 +00:00
Alexander Færøy
c57896a76e
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 13:37:20 +00:00
Alexander Færøy
b0bfee8c78
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:37:20 +00:00
Alexander Færøy
bebdd2888f
Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5
2020-06-30 13:35:13 +00:00
Alexander Færøy
96876d3ad7
Merge branch 'tor-github/pr/1940'
2020-06-30 01:22:44 +00:00
Nick Mathewson
feddba6f8b
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:57:50 -04:00
Nick Mathewson
86aa84e634
Merge branch 'maint-0.4.4'
2020-06-29 13:57:50 -04:00
Nick Mathewson
eef77227ef
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:57:41 -04:00
Nick Mathewson
d235e523d5
Merge branch 'ticket33290_v2_042' into maint-0.4.2
2020-06-29 13:57:13 -04:00
Nick Mathewson
b2ce815bd8
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:56:16 -04:00
Nick Mathewson
5b47a58d16
Merge branch 'maint-0.4.4'
2020-06-29 13:56:16 -04:00
Nick Mathewson
d124cfc058
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:56:04 -04:00
Nick Mathewson
a692b87f82
Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
2020-06-29 13:53:27 -04:00
Nick Mathewson
9e85515f83
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:48:32 -04:00
Nick Mathewson
def7844c4f
Merge branch 'maint-0.4.4'
2020-06-29 13:48:32 -04:00
Nick Mathewson
31bdfd4920
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:48:32 -04:00
Nick Mathewson
0575a182a6
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
2020-06-29 13:48:25 -04:00
Nick Mathewson
6fb31bb34a
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 12:58:50 -04:00
Nick Mathewson
6b71cc64cf
Merge branch 'maint-0.4.4'
2020-06-29 12:58:50 -04:00
Nick Mathewson
f862971d04
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 12:58:50 -04:00
Nick Mathewson
216456299f
Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2
2020-06-29 12:58:23 -04:00
Nick Mathewson
41a4243901
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 12:56:50 -04:00
Nick Mathewson
ea3a25ff51
Merge branch 'maint-0.4.4'
2020-06-29 12:56:50 -04:00
Nick Mathewson
3008255aea
Merge remote-tracking branch 'tor-github/pr/1829/head' into maint-0.4.3
2020-06-29 12:56:39 -04:00
Nick Mathewson
fd8ce812b0
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-29 12:55:35 -04:00
Nick Mathewson
2c61f22e43
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 12:55:35 -04:00
Nick Mathewson
c2843f9fe4
Merge branch 'maint-0.4.4'
2020-06-29 12:55:35 -04:00
Nick Mathewson
183d0d30d6
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 12:55:35 -04:00
Nick Mathewson
0c0214bcc0
Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
2020-06-29 12:55:27 -04:00
Alexander Færøy
f1932265fc
Merge branch 'dgoulet/tor-ticket40008_045_01'
2020-06-29 14:09:53 +00:00
Nick Mathewson
e429ceb266
Add a TLS_ERROR bootstrap failure reason.
...
If our TLS connection fails for a "misc" reason, we don't need to
say that the reason is "misc" -- we can at least localize it to
the TLS module.
Part of a fix for #32622 .
2020-06-26 10:59:59 -04:00
Nick Mathewson
d486c6cf74
Store errors from TLS write and handshake in the tls_error field.
...
Previously, we would only update this field when the error happened
during a read.
This will improves our reporting for our bootstrap status, and help
to address #32622 . The problem is not completely solved by this
patch, however: too many errors are still lumped into "MISC".
2020-06-26 10:58:53 -04:00
Nick Mathewson
5336ac2669
Move remaining CodeStructure.md contents into doxygen.
2020-06-26 10:11:42 -04:00
Nick Mathewson
e269e081a1
Remove changes files that appeared in tor 0.4.4.1-alpha.
2020-06-26 09:50:57 -04:00
Nick Mathewson
a7aa97298b
Remove special authority semantics for AssumeReachable.
...
AssumeReachable should only be about whether a relay thinks that it
is reachable itself. But previously, we've had it also turn off
reachability checking of _other_ relays on authorities.
(Technically, reachability tests were still run, but we would ignore
the results.)
With this patch, there is a new AuthDirTestReachability option
(default 1) that controls whether authorities run reachability
tests.
Making this change allows us to have test networks where authorities
set AssumeReachable without disabling their reachability testing
entirely.
Closes ticket #34445 .
2020-06-26 08:37:36 -04:00
Nick Mathewson
dbc2b75009
Merge branch 'assume_reachable_revamp'
2020-06-26 08:34:56 -04:00
Nick Mathewson
cb25f57724
Remove stub macro for router_new_consensus_params()
...
I had incorrectly believed that the router.c file was disabled when
we were building with relay mode disabled.
2020-06-26 08:32:33 -04:00
David Goulet
40922629fe
addr: Look at /48 for IPv6 in is_local_addr()
...
Closes #33618
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-25 13:45:05 -04:00
David Goulet
069566b40a
Merge branch 'tor-github/pr/1951'
2020-06-25 13:41:45 -04:00
David Goulet
374626c09b
Merge branch 'tor-github/pr/1917'
2020-06-25 13:35:34 -04:00
