Nick Mathewson
fbd384cf89
Merge branch 'maint-0.4.3'
...
"ours" to avoid 0.4.3.5 version bump.
2020-05-14 10:38:40 -04:00
Nick Mathewson
bbfdee4c4e
Fix a python warning in format_changelog.py.
2020-05-14 10:37:52 -04:00
Nick Mathewson
75fc33f337
bump to 0.4.3.5
2020-05-14 10:37:42 -04:00
Nick Mathewson
b8bff426f3
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-05-14 10:20:08 -04:00
Nick Mathewson
72312cdbb1
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-05-14 10:20:08 -04:00
Nick Mathewson
371d5ece5b
Merge branch 'maint-0.4.3'
2020-05-14 10:20:08 -04:00
Nick Mathewson
ee6409ab63
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-05-14 10:20:08 -04:00
Nick Mathewson
e63bfca5f2
Travis: temporarily fix stem version to d1174a83c2dcb7b8
...
This is a workaround for https://github.com/torproject/stem/issues/63
2020-05-14 08:08:24 -04:00
teor
5f577b0f25
circuitbuild: Refactor IPv6 extend node selection
...
Move this complex check into its own function.
Part of 33222.
2020-05-14 22:06:14 +10:00
teor
2e41d82cc5
circuitbuild: Refactor build state node selection flags
...
Move common build state to node selection flags conversion code into its
own function.
Part of 33222.
2020-05-14 22:05:46 +10:00
teor
6a0fdf381d
circuitbuild: test relays sending IPv6 extend cells
...
Add tests for relays sending IPv6 extend cells in
circuit_send_next_onion_skin().
Clients also use this code, check that they can only extend over IPv4
(for now).
Part of 33222.
2020-05-14 21:15:16 +10:00
teor
d41d13ea73
test: Move the origin circuit function to test helpers
...
Part of 33222.
2020-05-14 10:44:56 +10:00
teor
9949b545c8
test/circuitstats: Refactor common code
...
Refactor common circuitstats test code into its own function.
Part of 33222.
2020-05-14 10:38:09 +10:00
teor
e9c9e171ae
test/circuitstats: Fix a bunch of coding style issues
...
Part of 33222.
2020-05-14 10:23:14 +10:00
teor
de979dd7bd
practracker: Allow a few extra lines in circuituse
...
Part of 33222.
2020-05-13 20:08:29 +10:00
teor
115a453f04
test/circuitbuild: Add a test for origin_circuit_init()
...
Part of 33222.
2020-05-13 20:06:27 +10:00
teor
4d2822ee74
changes: file for 33222 and 33226
2020-05-13 16:05:54 +10:00
Nick Mathewson
1557e73c82
Merge branch 'bug34130_035'
2020-05-12 12:58:19 -04:00
Daniel Pinto
2913dbd6d9
Fix crash when tor is compiled with NSS and seccomp sandbox is enabled
...
Adds seccomp rules for socket and getpeername used by NSS
2020-05-12 12:56:06 -04:00
Nick Mathewson
86b5bcd80a
Merge remote-tracking branch 'tor-github/pr/1885/head'
2020-05-12 12:52:41 -04:00
teor
e2bd15b6f3
doc: Some tor features may not work with MiddleNodes
...
And fix a formatting issue in the MiddleNodes man page entry.
Part of 33226.
2020-05-11 17:06:43 +10:00
teor
8829d2d644
nodelist: Fix a comment and a log message
2020-05-11 17:01:49 +10:00
teor
1c1faf586a
routerlist: Choose nodes that can initiate IPv6 extends
...
Part of 33226.
2020-05-11 17:00:25 +10:00
teor
9e7f51e469
circuit: Add flags for IPv6 extends
...
But don't implement the actual node selection yet.
Part of 33226.
2020-05-11 16:54:01 +10:00
teor
b64972edcd
practracker: Accept extra or.h lines
2020-05-11 14:39:42 +10:00
teor
c7f085d9bd
protover: Add node functions for IPv6 extend support
...
Part of 33226.
2020-05-11 14:39:42 +10:00
teor
51f32140b4
protover: Sort version flags by their underlying protocols
...
Also fix some comment typos, mainly ">=" when the code says "=".
Part of 33226.
2020-05-11 12:24:06 +10:00
teor
e787e521af
protover: Declare support for Relay=3
...
Declare support for the new Relay=3 IPv6 extend protocol,
in C and Rust.
Part of 33226.
2020-05-11 11:08:20 +10:00
Daniel Pinto
cce16a939c
Improve logging of included config files
2020-05-08 01:10:59 +01:00
Daniel Pinto
cc169eb120
Add documentation about %include and seccomp sandbox limitations
2020-05-08 00:21:12 +01:00
Nick Mathewson
b7a165228f
Merge remote-tracking branch 'tor-github/pr/1880/head'
2020-05-07 08:19:11 -04:00
teor
492c512af4
relay: Improve docs on inform_testing_reachability()
...
Document race conditions that we'll resolve in 34067 and 34137.
Part of 33222.
2020-05-07 22:06:13 +10:00
teor
504b16fb75
relay: Rewrite inform_testing_reachability()
...
Rewrite inform_testing_reachability() to use separate buffers for IPv4
ORPort, IPv6 ORPort, and IPv4 DirPort. And use consistent APIs to fill
those buffers.
Part of 33222.
2020-05-07 20:59:10 +10:00
teor
e887887cd3
relay: Clarify a comment in selftest.c
2020-05-07 20:57:14 +10:00
Neel Chauhan
0daa1da3ba
Define and use TOR_ADDRPORT_BUF_LEN
2020-05-07 20:38:25 +10:00
teor
c76f310fe7
routerinfo: Make router_get_orport() return an error status
...
Part of 33222.
2020-05-07 20:25:36 +10:00
teor
24099680f1
Appease practracker: wrapping costs lines
2020-05-07 20:19:19 +10:00
teor
e1eecac888
Replace several C identifiers.
...
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
client_or_conn_should_skip_reachable_address_check router_or_conn_should_skip_reachable_address_check \
client_dir_conn_should_skip_reachable_address_check router_dir_conn_should_skip_reachable_address_check
2020-05-07 20:17:57 +10:00
teor
74902c8aca
Wrap long lines
2020-05-07 20:16:56 +10:00
teor
05c56ae455
Replace several C identifiers.
...
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
router_skip_orport_reachability_check router_should_skip_orport_reachability_check \
router_skip_dirport_reachability_check router_should_skip_dirport_reachability_check \
router_connect_assume_or_reachable client_or_conn_should_skip_reachable_address_check \
router_connect_assume_dir_reachable client_dir_conn_should_skip_reachable_address_check
It was generated with --no-verify, so it probably breaks some commit hooks.
The commiter should be sure to fix them up in a subsequent commit.
2020-05-07 20:07:13 +10:00
Nick Mathewson
3a785dd5be
Merge branch 'maint-0.4.3'
2020-05-06 17:17:19 -04:00
Nick Mathewson
b444096be5
Fix a boolean logic error when logging about invalid hostnames.
...
Fixes bug 34131; bugfix on 0.4.3.1-alpha.
2020-05-06 17:15:37 -04:00
Nick Mathewson
b7fcbb28d4
connection_or_finished_flushing(): add a missing "break;"
...
This one is harmless like the others (so far)
2020-05-06 17:09:27 -04:00
Nick Mathewson
e8fdba198e
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-05-06 17:07:47 -04:00
Nick Mathewson
b16c1e4cf6
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-05-06 17:07:27 -04:00
Nick Mathewson
d41f1cd3ed
btrack_orconn_cevent.c: Add a missing "break;"
2020-05-06 17:07:12 -04:00
Nick Mathewson
e39b35f1de
Merge branch 'maint-0.4.3'
2020-05-06 16:58:12 -04:00
Nick Mathewson
ae1ebb5f44
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-05-06 16:58:12 -04:00
Nick Mathewson
d46f67ef0e
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-05-06 16:58:12 -04:00
Nick Mathewson
633366efcd
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-05-06 16:58:12 -04:00