Nick Mathewson
7e010cac39
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-17 13:56:10 -04:00
Nick Mathewson
6803373aab
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 13:56:10 -04:00
Nick Mathewson
4ee2699416
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 13:56:10 -04:00
Nick Mathewson
cec647ff3e
Merge branch 'trove_2020_004_041_v2' into maint-0.4.1
2020-03-17 13:56:03 -04:00
Nick Mathewson
6babe51571
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-17 11:53:24 -04:00
Nick Mathewson
bc4c89eb2f
Split a wide line.
2020-03-17 11:53:01 -04:00
Nick Mathewson
5644086635
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-17 11:48:45 -04:00
George Kadianakis
5ff8757aa8
Add unittest for TROVE-2020-003.
...
This unittest currently fails on purpose (to demonstrate the bug) but it will
stop failing after the next commit (the bugfix).
2020-03-17 11:48:36 -04:00
Nick Mathewson
e15a621ac8
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 11:45:16 -04:00
Nick Mathewson
5f4e14b8c8
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-17 11:45:16 -04:00
Nick Mathewson
86bbd6eca3
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-17 11:45:16 -04:00
Nick Mathewson
bbc80ea042
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 11:45:16 -04:00
George Kadianakis
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
George Kadianakis
c940b7cf13
Trivial bugfixes found during TROVE investigation.
2020-03-17 11:43:03 -04:00
Nick Mathewson
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
Nick Mathewson
e150e1af75
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-16 12:21:57 -04:00
Nick Mathewson
855cd533e1
Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3
2020-03-16 12:21:49 -04:00
Nick Mathewson
612c40bc39
Adjust unit tests for patch for 32672 (rejecting old version)
...
Patch by Neel Chauhan.
2020-03-16 10:42:40 -04:00
Nick Mathewson
452398913a
Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test
2020-03-16 10:40:55 -04:00
Neel Chauhan
460b97380b
Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version()
2020-03-16 10:40:14 -04:00
teor
a9d66d37d3
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-16 20:54:38 +10:00
teor
93d12baf89
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-16 20:54:34 +10:00
teor
9ef8f5d1b8
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-16 20:54:27 +10:00
teor
c22696e360
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-16 20:54:20 +10:00
teor
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
Nick Mathewson
1df4221eed
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 16:57:42 -04:00
Nick Mathewson
a255ca9b12
Merge branch 'maint-0.4.2' into maint-0.4.3
...
"ours" to avoid version bump.
2020-03-13 16:57:27 -04:00
Nick Mathewson
2f4fa423c3
Merge branch 'maint-0.4.1' into maint-0.4.2
...
"ours" to avoid version bump.
2020-03-13 16:57:03 -04:00
Nick Mathewson
7a9e2a261b
Merge branch 'maint-0.3.5' into maint-0.4.1
...
"ours" to avoid version bump.
2020-03-13 16:56:44 -04:00
Nick Mathewson
d17108a187
Bump to 0.3.5.10
2020-03-13 16:56:31 -04:00
Nick Mathewson
7f0ad3343e
Bump to 0.4.1.9
2020-03-13 16:56:22 -04:00
Nick Mathewson
2c1a49c464
Bump to 0.4.2.7.
2020-03-13 16:56:06 -04:00
Nick Mathewson
51a2802a03
Fold a few more entries into the 0.4.3.3-alpha changelog
2020-03-13 16:54:00 -04:00
Nick Mathewson
938487d4b4
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-13 16:46:16 -04:00
Nick Mathewson
b2e543bfe7
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-13 16:46:16 -04:00
Nick Mathewson
6ed2c9e5fa
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-13 16:46:16 -04:00
Nick Mathewson
1b22b6e485
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 16:46:16 -04:00
Nick Mathewson
b9d71f3848
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
2020-03-13 16:46:09 -04:00
Nick Mathewson
cecfa09442
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 16:45:26 -04:00
Nick Mathewson
f686631918
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-13 16:45:17 -04:00
Nick Mathewson
b504942331
Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
2020-03-13 16:42:47 -04:00
teor
110b7a6762
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-13 13:01:27 +10:00
teor
dbadfe75e6
Merge remote-tracking branch 'tor-github/pr/1735' into maint-0.4.3
2020-03-13 13:00:58 +10:00
Nick Mathewson
13210e93f4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-12 13:45:06 -04:00
Nick Mathewson
3e42004e54
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
2020-03-12 13:42:42 -04:00
Nick Mathewson
8dc7ad1275
Fix unit tests that look at contactinfo logs.
2020-03-12 13:42:17 -04:00
Nick Mathewson
619cb682f4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-12 12:46:12 -04:00
Nick Mathewson
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
David Goulet
b755a489bd
config: Warn if ContactInfo is not set
...
Closes #33361
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-03-12 12:43:00 -04:00
Nick Mathewson
ad024c86c4
Merge branch 'maint-0.4.3' into release-0.4.3
2020-03-10 10:29:27 -04:00
