c10323faae
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-30 13:37:20 +00:00
b0bfee8c78
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:37:20 +00:00
bebdd2888f
Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5
2020-06-30 13:35:13 +00:00
ec2bc07f42
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 13:57:50 -04:00
d235e523d5
Merge branch 'ticket33290_v2_042' into maint-0.4.2
2020-06-29 13:57:13 -04:00
5668287fe7
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 13:53:39 -04:00
a692b87f82
Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
2020-06-29 13:53:27 -04:00
64b8ee3f9e
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 13:48:32 -04:00
0575a182a6
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
2020-06-29 13:48:25 -04:00
57390b76bf
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 12:58:50 -04:00
216456299f
Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2
2020-06-29 12:58:23 -04:00
51b4a4bd1c
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 12:55:35 -04:00
fd8ce812b0
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-29 12:55:35 -04:00
0c0214bcc0
Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
2020-06-29 12:55:27 -04:00
6b08392152
Merge branch 'maint-0.4.2' into release-0.4.2
2020-05-06 16:58:12 -04:00
d46f67ef0e
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-05-06 16:58:12 -04:00
633366efcd
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-05-06 16:58:12 -04:00
dd795fbee4
changes file for bug 34078.
2020-05-06 16:58:06 -04:00
21180862e0
Merge branch 'maint-0.4.2' into release-0.4.2
2020-05-04 10:25:52 -04:00
bbfc498e21
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-05-04 10:25:52 -04:00
d7e166bd95
Fix a GCC 10.0.1 compilation warning.
...
Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC
first gives this warning for 9eeff921ae
2020-04-30 22:56:31 -04:00
958f6eb5c7
Merge branch 'maint-0.4.2' into release-0.4.2
2020-04-09 11:03:30 +10:00
2d7e08d57e
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-04-09 11:03:27 +10:00
987f2fa50a
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-04-09 11:03:20 +10:00
d380acaeca
Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5
2020-04-09 11:02:49 +10:00
c22601765d
Merge branch 'maint-0.4.2' into release-0.4.2
2020-03-25 10:56:27 -04:00
048714d2ce
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-25 10:56:27 -04:00
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
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
aed3a3f795
Merge branch 'maint-0.4.2' into release-0.4.2
2020-03-20 11:24:54 +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
85141a3a74
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 15:22:36 -04:00
a74f620e52
Merge branch 'maint-0.4.2' into release-0.4.2
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
3751a40dcd
Construct initial 0.4.2.7 changelog.
2020-03-17 14:42:18 -04:00
4ee2699416
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 13:56:10 -04:00
9bdcfe51e2
Merge branch 'maint-0.4.2' into release-0.4.2
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
0d2dcc15c0
Merge branch 'maint-0.4.2' into release-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
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
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
015d5152fa
Merge branch 'maint-0.4.2' into release-0.4.2
2020-03-16 20:54:30 +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
Alexander Færøy
Nick Mathewson
teor
George Kadianakis