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
George Kadianakis
e8f0860557
Merge branch 'tor-github/pr/1792'
2020-03-19 13:43:49 +02:00
David Goulet
8bba933760
changes: Add changes file for ticket 33458
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-03-19 13:43:39 +02:00
David Goulet
4dbbe47d86
hs-v3: Improve accessor semantic of client cached object
...
Add an inline helper function that indicates if the cached object contains a
decrypted descriptor or not.
The descriptor object is NULL if tor is unable to decrypt it (lacking client
authorization) and some actions need to be done only when we have a decrypted
object.
This improves code semantic.
Fixes #33458
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-03-19 13:43:39 +02:00
teor
e9bb00d8c4
Merge branch 'maint-0.4.3'
2020-03-19 18:03:26 +10:00
teor
725efb7c98
doc: Fix a manual page typo
...
And consistently talk about extra-info document publishing.
Obviously correct documentation changes.
2020-03-19 18:02:32 +10:00
teor
c862205ba5
coverity: Silence spurious unreachable warning
...
Closes bug 33641; not in any released version of tor.
2020-03-19 17:11:13 +10:00
teor
fe5ecaa270
Merge branch 'maint-0.4.3'
2020-03-19 17:02:02 +10:00
teor
78b2984ac9
practracker: Regenerate exceptions file
...
Accept the current state of the tor codebase, including all the
files and functions that have increased technical debt over the
last few months.
Accepts all the current practracker warnings, so that reviewers
can focus on new warnings.
Closes ticket 33635.
2020-03-19 16:59:52 +10:00
teor
259fad5877
Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3
2020-03-19 16:56:49 +10:00
Roger Dingledine
987247bd76
fix typo in comment
2020-03-19 00:41:57 -04:00
teor
85414e1c18
doc: Fix a man page typo
...
Obviously correct changes to already-reviewed code.
2020-03-19 09:24:15 +10:00
Nick Mathewson
9b30766451
Merge branch 'maint-0.4.3'
...
"ours" to avoid version bump.
2020-03-18 12:17:32 -04:00
Nick Mathewson
d925d2995c
Merge branch 'maint-0.4.2' into maint-0.4.3
...
"ours" to avoid version bump.
2020-03-18 12:17:20 -04:00
Nick Mathewson
190cda0e2b
Merge branch 'maint-0.4.1' into maint-0.4.2
...
"ours" to avoid version bump.
2020-03-18 12:17:11 -04:00
Nick Mathewson
cb69a5a118
Merge branch 'maint-0.3.5' into maint-0.4.1
...
"ours" to avoid version bump.
2020-03-18 12:16:59 -04:00
Nick Mathewson
a17f4b11b4
Bump version to 0.4.2.7-dev
2020-03-18 12:16:11 -04:00
Nick Mathewson
efdbf42432
Bump version to 0.4.1.9-dev
2020-03-18 12:15:53 -04:00
Nick Mathewson
3150c30351
Bump version to 0.3.5.10-dev
2020-03-18 12:15:32 -04:00
Nick Mathewson
7793ccdee4
Copy changelogs for today's releases to master.
2020-03-18 09:06:49 -04:00
Nick Mathewson
7059c32968
Merge branch 'maint-0.4.3'
2020-03-18 08:20:38 -04:00
Nick Mathewson
84f57b69f3
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-18 08:20:16 -04:00
Nick Mathewson
758deaa472
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-18 08:20:16 -04:00
Nick Mathewson
4ad3f17c26
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-18 08:20:16 -04:00
Nick Mathewson
0526801ed4
Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.
2020-03-18 08:19:48 -04:00
Nick Mathewson
3d8c97a988
Merge branch 'maint-0.4.3'
2020-03-17 15:22:36 -04:00
Nick Mathewson
e0d68ce84f
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 15:22:36 -04:00
Nick Mathewson
85141a3a74
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 15:22:36 -04:00
Nick Mathewson
57b1d0848e
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-17 15:22:36 -04:00
Nick Mathewson
3c8a4b8fbd
Merge branch 'trove_2020_002_041' into maint-0.4.1
2020-03-17 15:22:02 -04:00
Nick Mathewson
fe3d8ec38e
Merge branch 'trove_2020_002_035' into maint-0.3.5
2020-03-17 15:21:48 -04:00
Nick Mathewson
d4595b344a
Merge branch 'maint-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
d3c4ed08f1
Merge branch 'maint-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
7cd4dcf5a6
Merge branch 'maint-0.4.3'
2020-03-17 11:48:45 -04:00
