George Kadianakis
279225acdd
Merge branch 'tor-github/pr/1929'
2020-06-24 17:20:25 +03:00
David Goulet
2d91960540
Merge branch 'tor-github/pr/1942'
2020-06-24 07:44:41 -04:00
George Kadianakis
a3b573b392
Merge branch 'tor-github/pr/1943'
2020-06-23 20:31:44 +03:00
Mike Perry
220ed863ce
Relocate CBT event to control_events.c
...
Needed to satisfy practracker.
2020-06-23 20:31:26 +03:00
Mike Perry
8e7a069130
Changes file for DROPTIMEOUTS
2020-06-23 20:31:26 +03:00
Mike Perry
ad1f8b70b7
Mark state file dirty upon DROPTIMEOUTS command
2020-06-23 20:31:26 +03:00
George Kadianakis
68d848e244
Reinstate support for GUARD NEW/UP/DOWN control port events.
2020-06-23 19:48:37 +03:00
Nick Mathewson
65328fd4e7
Merge branch 'maint-0.4.4'
2020-06-23 12:29:47 -04:00
Nick Mathewson
318753f502
Merge branch 'ticket34382' into maint-0.4.4
2020-06-23 12:29:39 -04:00
Nick Mathewson
ac648fa307
Clarify logic in router_should_skip_orport_reachability_check_family()
...
The '!=' checks were confusing the issue of what the code was really
doing.
2020-06-23 11:24:20 -04:00
Nick Mathewson
b365179ee0
reachability_warnings_callback: simplify v4/v6_ok logic
...
Since "skip orport check" is the "and" of v4_ok and v6_ok, we can
just compute v4_ok and v6_ok once, to clarify that we don't enter
this block of code if they're both true.
2020-06-23 11:20:05 -04:00
David Goulet
d08d7e1535
addr: Rename last_resolved_addr to be v4 specific
...
Part of #33233
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-23 09:25:36 -04:00
David Goulet
6da8c0b4fa
addr: Rename resolve_my_address to be v4 specific
...
Part of #33233
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-23 09:25:36 -04:00
David Goulet
47f9edde69
config: Change Address to be a LINELIST
...
With prop312, we want to support IPv4 and IPv6 thus multiple Address statement
(up to 2) will be accepted.
For this, "Address" option becomes a LINELIST so we can properly process the
IPv4 or/and IPv6.
Part of #33233
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-23 09:25:36 -04:00
David Goulet
d3bcbccab9
Merge branch 'maint-0.4.4'
2020-06-23 08:52:33 -04:00
David Goulet
5232315168
Merge branch 'tor-github/pr/1937' into maint-0.4.4
2020-06-23 08:52:16 -04:00
Alexander Færøy
8dc7ae113b
Update Trac links in README to point to Gitlab.
2020-06-22 19:41:52 +00:00
Nick Mathewson
ceddc39c59
Merge branch 'pr_1930_squashed'
2020-06-22 15:33:27 -04:00
Neel Chauhan
5a89fd2a04
Add changes file for ticket 33816
2020-06-22 15:33:03 -04:00
Neel Chauhan
3bb955a02f
Add circuit_extend_add_ipv(4/6)_helper() test
2020-06-22 15:33:03 -04:00
Neel Chauhan
48310a0e76
Fill in missing IPv6 addresses in extend cells
2020-06-22 15:33:03 -04:00
David Goulet
c55e633f74
kist: Document a magic value in channel_should_write_to_kernel()
...
Closes #40008
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-22 15:28:47 -04:00
David Goulet
033f804429
Merge branch 'maint-0.4.4'
2020-06-22 14:57:50 -04:00
Miguel Jacq
3d0e1c42d9
Consistently use 'address' in Invalid v3 address responses to ONION_CLIENT_AUTH commands
2020-06-22 14:56:07 -04:00
Nick Mathewson
bc9979a670
Split "can reach ipv4 orport" from "can reach ipv6 orport".
...
I've managed to keep this change mainly contained to our
self-testing module. The changes here are:
* There are two different variables for tracking "is our orport
reachable".
* We have a new function that says whether we can skip a single
family's orport reachability test; the old function for this now
tells whether we can skip _all_ orport reachability testing.
(The name, router_should_skip_orport_reachability_test, is not
so good. I will rename it later if I can think of a good
replacement.)
* The function that launches orport reachability tests now only
launches the ones that haven't completed.
* The function that notes that we're reachable on an ORPort now
takes a family.
* Various log messages are cleaned up.
2020-06-18 16:05:16 -04:00
Neel Chauhan
caebfa5f6f
Fix typo in test_build_update_descriptors() comment
2020-06-17 20:12:13 -07:00
Nick Mathewson
6c3897826a
selftest: turn can_reach_{dir,or}_port into bools
2020-06-17 16:29:24 -04:00
Neel Chauhan
7cf031a0cc
Reject Tor relays running the 0.4.1 series
2020-06-17 12:00:44 -07:00
Nick Mathewson
b67f7d722d
Update the list of recommended protocol versions to match >=0.3.5.
...
Since Tor 0.2.9 has been unsupported since January, 0.3.5 is the
oldest supported version, and its features constitute the oldest
recommended feature-set.
This patch updates these recommendations:
DirCache=2
Support for consensus diffs.
New in 0.3.1.1-alpha.
HSDir=2
Support for v3 onion service descriptors.
New in 0.3.0.4-alpha.
HSIntro=4
Support for Ed25519 intropoint authentication keys.
New in 0.3.0-4-alpha.
HSRend=2
Support for rendezvous cells longer than 20 bytes.
New in 0.2.9.4-alpha.
Link=5
Link padding and link padding negotiation.
New in 0.3.3.2-alpha.
LinkAuth=3
Ed25519 link authentication.
New in 0.3.0.1-alpha.
2020-06-17 11:07:43 -04:00
Nick Mathewson
a82c0cdfcf
Spelling fix: "RECCOMEND" => "RECOMMEND".
2020-06-17 10:37:47 -04:00
Nick Mathewson
48ff6a41ae
Merge branch 'maint-0.4.4'
...
"ours" to avoid version bump.
2020-06-16 19:39:03 -04:00
Nick Mathewson
93d582b8e9
Bump to 0.4.4.1-alpha-dev
2020-06-16 19:38:38 -04:00
Nick Mathewson
0b889e709d
forward-port the changelog for 0.4.4.1-alpha
2020-06-16 17:52:45 -04:00
Mike Perry
c047c6d5b8
practracker FTL!
...
Faster Than Light!
2020-06-16 13:44:10 -05:00
Mike Perry
954421ab7c
Bug 32040: Changes files
...
Not the whole story; machines still need to use this.
2020-06-16 12:26:18 -05:00
Mike Perry
a4a0cb8d55
Bug 32040: Machine updates.
...
Does not require protover update, since this is just client-side.
2020-06-16 12:26:17 -05:00
Mike Perry
ce9a4e5baf
Bug 32040: Tests
2020-06-16 12:24:34 -05:00
Mike Perry
f697ac5861
Bug 32040: Add a keep_*_mask to keep circpad machines
...
Allows us to program machines that stay around after creation if circuit state
or purpose changes.
2020-06-16 12:24:29 -05:00
Nick Mathewson
285dbeefa1
Merge branch 'maint-0.4.4'
...
"ours" to avoid version bump.
2020-06-15 16:45:25 -04:00
Nick Mathewson
148291a52e
Bump to 0.4.4.1-alpha
2020-06-15 16:45:18 -04:00
Nick Mathewson
7e600a74bc
Merge branch 'maint-0.4.4'
2020-06-15 16:43:18 -04:00
Nick Mathewson
85c0ba1cfb
forward-port changelog and release-notes from 0.4.3.5
2020-06-15 16:43:09 -04:00
Nick Mathewson
9fdaede3f7
Remove AssumeReachable from TestingTorNetwork.
...
Closes ticket 34446.
2020-06-15 14:08:42 -04:00
David Goulet
8361e3c4ab
core: Remove unused files
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-12 14:40:49 -04:00
David Goulet
0f218a05a6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-12 12:55:41 -04:00
David Goulet
272c171136
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-12 12:55:41 -04:00
David Goulet
75734f48aa
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-12 12:55:41 -04:00
David Goulet
ffc2405621
Merge branch 'maint-0.4.4'
2020-06-12 12:55:41 -04:00
David Goulet
53faca10ad
Merge branch 'tor-github/pr/1913'
2020-06-12 12:55:34 -04:00
David Goulet
6a43aadecc
Merge branch 'tor-github/pr/1912' into maint-0.3.5
2020-06-12 12:55:17 -04:00