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
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
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
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
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
Nick Mathewson
6c3897826a
selftest: turn can_reach_{dir,or}_port into bools
2020-06-17 16:29:24 -04: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
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
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
272c171136
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-12 12:55:41 -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
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
George Kadianakis
3cb77a9cca
Merge branch 'maint-0.4.4'
2020-06-11 17:29:54 +03:00
George Kadianakis
52edea121e
Fold in a changes file and update exceptions.txt.
...
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:13:25 +03:00
George Kadianakis
755b8252a4
Fix and update unittests.
...
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:13:20 +03:00
George Kadianakis
714e235a3c
Update functions that load and write the guard state file.
...
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:13:13 +03:00
George Kadianakis
d2c3b6ea1e
Pick guards on the order they were sampled (prop310).
...
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:13:09 +03:00
Florentin Rochet
7bf0587ef1
Refactor some guard state file parsing code into functions.
...
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:12:31 +03:00
George Kadianakis
1797d05165
Merge branch 'tor-github/pr/1925'
2020-06-10 15:37:59 +03:00
Mike Perry
963c3591c8
Bug 30992: Changes file
2020-06-10 15:37:44 +03:00
Mike Perry
1300e6a512
Bug 30992: Update tests
2020-06-10 15:37:44 +03:00
Mike Perry
0a4bc8fe90
Bug 30992: Track a padding machine ctr to reduce race issues.
...
This tracking of the instantiation count should eliminate race conditions due
to starting and stopping machines rapidly. Now, we should no longer obey
STOP commands for previous machines.
2020-06-10 15:37:44 +03:00
Nick Mathewson
1e230bd488
Merge branch 'maint-0.4.4'
...
("Ours" to avoid removal of .enable_practracker_in_hooks)
2020-06-09 15:47:44 -04:00
Nick Mathewson
fc16dbf7aa
Remove "enable_practracker_in_hooks" for 0.4.4.
2020-06-09 15:47:25 -04:00
Nick Mathewson
354f085e5f
Merge remote-tracking branch 'tor-github/pr/1888/head'
2020-06-09 15:44:58 -04:00
Nick Mathewson
eaae5625cb
Add 0.4.4 to list of tor branches used by git scripts.
2020-06-09 14:17:15 -04:00