0db545b17a
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-20 08:06:53 -04:00
e380396d42
Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3
2020-03-20 08:06:30 -04:00
3913575acd
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-20 07:57:19 -04:00
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
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
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
4225301444
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-20 11:25:01 +10:00
eb2d08a72c
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-20 11:24:57 +10:00
3aa855dc68
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-20 11:24:51 +10:00
42ea03eb7f
Merge branch 'ticket33643_skip_035' into ticket33643_skip_041
2020-03-19 18:38:18 -04:00
ee3d23c05a
Appveyor: disable crypto/openssl_version
2020-03-19 18:36:36 -04:00
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
6c2b153db0
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-19 17:01:58 +10:00
259fad5877
Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3
2020-03-19 16:56:49 +10:00
2d47cb984d
fold in changelog and blurb for trove-2020-002
2020-03-17 15:37:34 -04:00
e0d68ce84f
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 15:22:36 -04:00
85141a3a74
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 15:22:36 -04:00
3bd0601aec
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-17 15:22:36 -04:00
3c8a4b8fbd
Merge branch 'trove_2020_002_041' into maint-0.4.1
2020-03-17 15:22:02 -04:00
fe3d8ec38e
Merge branch 'trove_2020_002_035' into maint-0.3.5
2020-03-17 15:21:48 -04:00
4d1d8bde95
Fold new items into 0.4.3.3-alpha changelog.
2020-03-17 14:22:36 -04:00
6803373aab
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 13:56:10 -04:00
4ee2699416
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 13:56:10 -04:00
7e010cac39
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-17 13:56:10 -04:00
cec647ff3e
Merge branch 'trove_2020_004_041_v2' into maint-0.4.1
2020-03-17 13:56:03 -04:00
e15a621ac8
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 11:45:16 -04:00
5f4e14b8c8
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-17 11:45:16 -04:00
86bbd6eca3
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-17 11:45:16 -04:00
bbc80ea042
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 11:45:16 -04:00
089e57d22f
Fix TROVE-2020-003.
...
Given that ed25519 public key validity checks are usually not needed
and (so far) they are only necessary for onion addesses in the Tor
protocol, we decided to fix this specific bug instance without
modifying the rest of the codebase (see below for other fix
approaches).
In our minimal fix we check that the pubkey in
hs_service_add_ephemeral() is valid and error out otherwise.
2020-03-17 11:44:45 -04:00
ee3e987898
sendme: Emit version 1 by default
...
Closes #33623
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-03-17 10:14:57 -04:00
78bcfc1280
circpad_setup_machine_on_circ(): exit early on error.
...
This function does a nonfatal assertion to make sure that a machine
is not registered twice, but Tobias Pulls found a case where it
happens. Instead, make the function exit early so that it doesn't
cause a remotely triggered memory leak.
Fixes bug 33619; bugfix on 0.4.0.1-alpha. This is also tracked as
TROVE-2020-004.
2020-03-16 17:59:57 -04:00
e150e1af75
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-16 12:21:57 -04:00
855cd533e1
Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3
2020-03-16 12:21:49 -04:00
452398913a
Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test
2020-03-16 10:40:55 -04:00
460b97380b
Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version()
2020-03-16 10:40:14 -04:00
a9d66d37d3
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-16 20:54:38 +10:00
93d12baf89
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-16 20:54:34 +10:00
9ef8f5d1b8
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-16 20:54:27 +10:00
c22696e360
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-16 20:54:20 +10:00
1c688ba925
Travis: Produce detailed chutney diagnostics
...
When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
to produce detailed diagnostic output.
Closes ticket 32792.
2020-03-16 16:04:51 +10:00
51a2802a03
Fold a few more entries into the 0.4.3.3-alpha changelog
2020-03-13 16:54:00 -04:00
b2e543bfe7
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-13 16:46:16 -04:00
6ed2c9e5fa
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-13 16:46:16 -04:00
b9d71f3848
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
2020-03-13 16:46:09 -04:00
b504942331
Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
2020-03-13 16:42:47 -04:00
110b7a6762
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 13:01:27 +10:00
dbadfe75e6
Merge remote-tracking branch 'tor-github/pr/1735' into maint-0.4.3
2020-03-13 13:00:58 +10:00
619cb682f4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-12 12:46:12 -04:00
e03bb35f90
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
...
Conflicts:
src/app/config/config.c
2020-03-12 12:45:56 -04:00
Nick Mathewson
teor
George Kadianakis
David Goulet
Neel Chauhan