David Goulet
f30f53e099
Merge branch 'tor-github/pr/1907'
2020-07-01 12:26:19 -04:00
Neel Chauhan
b558971c07
Add changes file for Ticket #28279
2020-07-01 12:00:53 -04:00
Neel Chauhan
4173876bc4
Add GETINFO "rephist/{tap,ntor}/onion_handshakes_{assigned/requested}" test
2020-07-01 12:00:53 -04:00
Neel Chauhan
4477317cbe
control: Add a key to GETINFO to fetch the circuit onion handshake rephist values
2020-07-01 12:00:53 -04:00
Nick Mathewson
368156fcb7
Merge branch 'ticket34137'
2020-07-01 10:34:39 -04:00
Nick Mathewson
5d956d797b
Add a comment explaining reachability vs bandwidth self-tests
...
This is in response to a question about why we don't always log
orport self-tests as reachability tests.
I'm not 100% convinced that bandwidth self-tests are still useful,
but that's an issue for another day. :)
2020-07-01 10:33:27 -04:00
David Goulet
b039d3e803
Merge branch 'tor-github/pr/1953'
2020-07-01 09:47:26 -04:00
George Kadianakis
7f999203ce
Merge branch 'maint-0.4.4'
2020-07-01 12:55:03 +03:00
George Kadianakis
0d02c053f8
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-07-01 12:55:03 +03:00
George Kadianakis
1932a84ef5
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-01 12:55:02 +03:00
George Kadianakis
38208185be
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-01 12:55:02 +03:00
George Kadianakis
9beae02713
Merge branch 'tor-github/pr/1766' into maint-0.3.5
2020-07-01 12:54:29 +03:00
Nick Mathewson
8f59b3e6f2
resolve_addr.c: remove a needless quote mark
2020-06-30 14:36:11 -04:00
Nick Mathewson
8dd9097bdc
Merge remote-tracking branch 'dgoulet/ticket40009_045_01'
2020-06-30 14:35:25 -04:00
David Goulet
ec57cbf179
addr: Document better is_local_addr_to_resolve_addr()
...
This function is about learning if a given address is local to us as in the
resolved address as a relay.
Closes #40009
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-30 13:50:01 -04:00
David Goulet
2ac2ba4e2c
node: Rename addrs_in_same_network_family()
...
New name reflects that the function is only used to compare router addresses
in order to learn if they are in the same network.
The network check is /16 and /32 respectively for IPv4 and IPv6.
Related to #40009
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-30 13:48:22 -04:00
David Goulet
7a6e1f2491
scripts: Fix rename_c_identifier.py uncommitted warning
...
Only warn when we actually want a commit _and_ there are uncommitted changes
found. Else, it is fine to rename if the script is not creating a commit.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-30 13:48:22 -04:00
Nick Mathewson
2238b6320b
Refactor reachability test logging: log exactly what we launch.
...
Previously we had two chains of logic for reachability tests: one
for launching them, and one for telling the user that we had
launched them. Now, we simply have the launch code inform the user:
this way, we can't get out of sync.
Closes ticket 34137.
2020-06-30 11:12:46 -04:00
Alexander Færøy
9638c6d7a7
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:23:41 +00:00
Alexander Færøy
322abd4fd9
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 14:23:41 +00:00
Alexander Færøy
dbb70d85bf
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 14:23:41 +00:00
Alexander Færøy
081d84c1de
Merge branch 'maint-0.4.4'
2020-06-30 14:23:41 +00:00
Alexander Færøy
8697205be4
Merge branch 'tor-github/pr/1909' into maint-0.3.5
2020-06-30 14:23:17 +00:00
Alexander Færøy
0d5152fc53
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:19:44 +00:00
Alexander Færøy
90c313e87c
Merge branch 'maint-0.4.4'
2020-06-30 14:19:44 +00:00
Alexander Færøy
5a38c73f70
Merge branch 'tor-github/pr/1887' into maint-0.4.3
2020-06-30 14:19:28 +00:00
Alexander Færøy
bb5745d656
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:16:16 +00:00
Alexander Færøy
8f2571b233
Merge branch 'maint-0.4.4'
2020-06-30 14:16:16 +00:00
Alexander Færøy
fb46d1bb34
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 14:16:16 +00:00
Alexander Færøy
881f50a9a9
Merge branch 'tor-github/pr/1806' into maint-0.4.2
2020-06-30 14:15:57 +00:00
Alexander Færøy
572cf774b9
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:03:04 +00:00
Alexander Færøy
5e1c0c7dbb
Merge branch 'maint-0.4.4'
2020-06-30 14:03:04 +00:00
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
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
