Roger Dingledine
a4304c6031
fix typo in log message
2020-03-27 02:51:01 -04:00
Nick Mathewson
e7290dc8c0
Merge remote-tracking branch 'tor-github/pr/1780/head'
2020-03-26 10:38:08 -04:00
David Goulet
cf58b0b369
Merge branch 'maint-0.4.3'
2020-03-26 09:15:01 -04:00
David Goulet
e472737297
Merge branch 'tor-github/pr/1794' into maint-0.4.3
2020-03-26 09:14:25 -04:00
Nick Mathewson
b2cda32693
Merge branch 'maint-0.4.3'
2020-03-25 10:56:27 -04:00
Nick Mathewson
03b0d1840a
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-25 10:56:27 -04:00
Nick Mathewson
048714d2ce
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-25 10:56:27 -04:00
Nick Mathewson
2eb78e2061
Merge branch 'bug33651'
2020-03-25 10:38:01 -04:00
George Kadianakis
6b0a40c81e
Merge branch 'tor-github/pr/1789'
2020-03-23 16:57:49 +02:00
George Kadianakis
a4d60ff854
Merge branch 'maint-0.4.3'
2020-03-23 16:57:27 +02:00
George Kadianakis
29420ab396
Merge branch 'tor-github/pr/1788' into maint-0.4.3
2020-03-23 16:56:59 +02:00
Nick Mathewson
a0efba9bd0
Merge remote-tracking branch 'tor-github/pr/1797/head'
2020-03-23 09:05:45 -04:00
teor
a34a88c6f1
practracker: Accept changes
...
Accept a smaller file and function.
Let router.c grow slightly without warning.
Accept an extra comment line.
Cleanup after 32588.
2020-03-21 04:10:24 +10:00
teor
1d22411cea
Add some comments about future relay IPv6 work
...
Comments about 33681.
2020-03-21 04:07:17 +10:00
teor
e0eec3bf29
parseconf: Add ORPort and DirPort auto tests
...
These tests don't actually trigger bug 32588, but they do increase
the coverage of the auto port config code.
Tests for 32588.
2020-03-21 04:07:03 +10:00
teor
4b914dea02
Merge branch 'bug32588_043' into bug32588_master
2020-03-21 04:02:08 +10:00
teor
52f61ec83e
Merge branch 'bug32588_042' into bug32588_043
...
Merge static function declaration deletions from bug32588_042 and
maint-0.4.3 in app/config/config.c.
2020-03-21 04:01:00 +10:00
teor
5e2f31f177
Merge branch 'bug32588_041' into bug32588_042
2020-03-21 03:52:32 +10:00
teor
2962c32b7a
Merge branch 'bug32588_035' into bug32588_041
...
Merge tests from maint-0.4.1 with new tests from bug32588_035
in test_router.c.
2020-03-21 03:50:36 +10:00
Nick Mathewson
96ca14d989
Add a test for the localhost case.
2020-03-21 03:44:01 +10:00
Nick Mathewson
1251265a0f
Extend test to handle router_get_advertised_ipv6_or_ap
2020-03-21 03:43:58 +10:00
Nick Mathewson
1ba79d4567
Add a test for router_get_advertised_or_port_by_af().
2020-03-21 03:43:55 +10:00
Nick Mathewson
6ffe073db7
Add tests for get_first_advertised_{addr,port}_by_type_af()
2020-03-21 03:43:52 +10:00
teor
bac8bc0ff1
router: Refactor IPv6 ORPort function logic
...
Return early when there is no suitable IPv6 ORPort.
Show the address and port on error, using a convenience function.
Code simplification and refactoring.
Cleanup after 32588.
2020-03-21 03:43:48 +10:00
teor
861337fd6d
router: Stop advertising incorrect auto IPv6 ORPorts
...
When IPv6 ORPorts are set to "auto", tor relays and bridges would
advertise an incorrect port in their descriptor.
This may be a low-severity memory safety issue, because the published
port number may be derived from uninitialised or out-of-bounds memory
reads.
Fixes bug 32588; bugfix on 0.2.3.9-alpha.
2020-03-21 03:36:39 +10:00
teor
5d53b2317f
practracker: Accept larger dirvote file
...
Due to improved function comments.
2020-03-21 02:48:51 +10:00
teor
f9fef2633f
relay: Set some output arguments in stubs
...
Fixes part of bug 33674; not in any released version of tor.
2020-03-21 02:48:40 +10:00
Nick Mathewson
89bd58837c
Merge branch 'maint-0.4.3'
2020-03-20 08:06:53 -04:00
Nick Mathewson
269d3f2760
Merge remote-tracking branch 'tor-github/pr/1824/head'
2020-03-20 08:06:46 -04:00
Nick Mathewson
e380396d42
Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3
2020-03-20 08:06:30 -04:00
Nick Mathewson
3e24bd5557
Merge branch 'maint-0.4.3'
2020-03-20 07:56:42 -04:00
teor
d4a74021e5
relay/dirauth: Set some output arguments in stubs
...
And document how some functions set their output arguments.
Fixes bug 33674; bugfix on 0.4.3.1-alpha.
2020-03-20 07:56:26 -04:00
Nick Mathewson
c478dc9b2f
Set *have_low_ports_out from stub port_parse_ports_relay().
...
Previously we just ignored this option, which would leave it unset,
and cause an assertion failure later on when running with the User
option.
Fixes bug 33668; bugfix on 0.4.3.1-alpha.
2020-03-20 07:56:26 -04:00
teor
d66005ada7
Merge branch 'ticket33678_043' into ticket33678_master
...
Don't take the practracker disable changes from 0.4.3.
2020-03-20 17:33:56 +10:00
teor
bb3df5f322
practracker: Disable practracker in git hooks
...
Disable our coding standards best practices tracker in our git hooks.
0.4.3 branches only.
Closes ticket 33678.
2020-03-20 17:32:57 +10:00
teor
2f1f3b1702
Merge branch 'maint-0.4.3'
2020-03-20 15:40:39 +10:00
teor
250b8499b8
dirauth: Remove a duplicate macro definition
...
Obviously correct changes to already-reviewed code.
2020-03-20 15:39:55 +10:00
teor
26fd31fef8
Merge branch 'bug33673_035' into bug33673_041
...
Merge duplicate DLL copies from maint-0.4.1 with bug33673_035.
2020-03-20 14:49:11 +10:00
teor
38e07b88fa
Appveyor: Copy required DLLs to test and app
...
Copy required DLLs to test and app, before running tor's tests.
This ensures that tor.exe and test*.exe use the correct version of each
DLL. This fix is not required, but we hope it will avoid DLL search
issues in future.
Closes bug 33673; bugfix on 0.3.4.2-alpha.
2020-03-20 14:48:31 +10:00
teor
4bb06cae26
Merge branch 'maint-0.4.3'
2020-03-20 11:25:04 +10:00
teor
eb2d08a72c
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-20 11:24:57 +10:00
teor
3aa855dc68
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-20 11:24:51 +10:00
Nick Mathewson
42ea03eb7f
Merge branch 'ticket33643_skip_035' into ticket33643_skip_041
2020-03-19 18:38:18 -04:00
Nick Mathewson
ee3d23c05a
Appveyor: disable crypto/openssl_version
2020-03-19 18:36:36 -04:00
Nick Mathewson
6bafe97bc1
Add a TOR_SKIP_TESTCASES environment variable for suppressing tests.
...
For example, "TOR_SKIP_TESTCASES=crypto/.. ./src/test/test" will run
the tests and suppress all the "crypto/" tests. You could get the
same effect by running "./src/test/test :crypto/..", but that can be
harder to arrange from CI.
Part of a fix/workaround for 33643.
2020-03-19 18:36:36 -04:00
Neel Chauhan
52b4b7e492
Fix erroneous spaces in circuitmux_ewma.c
2020-03-19 13:18:26 -07:00
George Kadianakis
dccac40e69
Merge branch 'tor-github/pr/1778'
2020-03-19 17:16:00 +02:00
Nick Mathewson
9bcd7e5939
Actually log post-bootstrap directory dl totals.
...
Fixes bug 33651; bug not in any released Tor.
2020-03-19 08:08:58 -04:00
Nick Mathewson
9ffbe8ad59
Remove changes files that have appeared in 0.4.3.3-alpha
...
(findMergedChanges.pl is the tool to do this.)
2020-03-19 08:07:21 -04:00
Nick Mathewson
4f596b3edf
Merge remote-tracking branch 'tor-github/pr/1807/head'
2020-03-19 08:02:09 -04:00
