3e8e4af1ac
Merge branch 'bug33195_042' into bug33195_043
...
Conflicts:
* Keep disable module relay from maint-0.4.3
* Keep doxygen from maint-0.4.3
* Keep the ordering from bug33195_042
2020-02-13 14:21:26 +10:00
f021389e92
Merge branch 'bug33195_041' into bug33195_042
...
Conflicts:
* Keep RUST_VERSION from maint-0.4.2
* Keep the commented-out allow_failure entries from bug33195_041
2020-02-13 13:58:13 +10:00
c96cf14943
Merge branch 'bug33195_035' into bug33195_041
...
Conflicts:
* Keep TOR_TEST_RNG_SEED from maint-0.4.1
* Keep the ordering from bug33195_035
2020-02-13 13:55:55 +10:00
add387c507
Travis: Sort jobs in order of speed
...
Putting the slowest jobs first takes full advantage of Travis
concurrency.
Closes 33194.
2020-02-13 13:52:41 +10:00
fc3555100f
Travis: Remove a redundant distcheck job
...
Part of 33194.
2020-02-13 13:45:18 +10:00
03650e0f60
Travis: Require the macOS IPv6 chutney job
...
The job was previously set to fast_finish / allow_failure, to
speed up the build.
Closes ticket 33195.
2020-02-13 13:43:59 +10:00
d0c3350218
Run "make autostyle".
2020-02-12 18:25:51 -05:00
3147cbba52
Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3
2020-02-12 13:48:39 -05:00
0ab859aabe
changes file for ticket 33188
2020-02-12 12:28:35 -06:00
d33c80f0ee
Moved [[RephistTrackTime]] to General Options.
2020-02-12 23:17:31 +05:30
809090d24d
Addressed minor changes suggested in the ticket
2020-02-12 23:07:00 +05:30
e0ea7407a4
Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3
2020-02-12 14:14:11 +10:00
0e00d9369f
Merge branch 'maint-0.4.2' into maint-0.4.3
...
"ours" merge, because simiar BridgeDistribution fixes have already
been merged to maint-0.4.3. (See 32753.)
The stem changes in 33075 have already been merged to maint-0.4.3,
so this "ours" merge does not affect them.
2020-02-12 14:13:15 +10:00
88489cd290
hs-v3: Remove BUG() that can occur normally
...
Fixes #28992
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-02-12 14:09:40 +10:00
ff52205362
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-02-12 12:22:04 +10:00
5298113da9
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-02-12 12:21:57 +10:00
b9c7c61ea5
Lowercase the BridgeDistribution value from torrc in descriptors.
...
This patch ensures that we always lowercase the BridgeDistribution from
torrc in descriptors before submitting it.
See: https://bugs.torproject.org/32753
2020-02-12 12:21:41 +10:00
88723ad169
Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5
2020-02-12 12:18:59 +10:00
de31c4757b
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-02-11 08:53:41 -05:00
00fe214729
Merge branch 'maint-0.4.1' into maint-0.4.2
...
"ours" merge, since the exceptions.txt file is already fixed in this branch.
2020-02-11 08:53:00 -05:00
0ff3e8f4a0
Remove a redundant practracker exception line in maint-0.4.1
...
This will our "git push" hook not complain about pushing from
maint-0.4.1.
2020-02-11 08:52:26 -05:00
409e1ca3d5
Merge remote-tracking branch 'tor-github/pr/1716/head' into maint-0.4.3
2020-02-11 08:44:18 -05:00
9f7e1ccacb
Undefined name: make_key() -> make_rsa_key()
2020-02-11 08:35:11 -05:00
5d56c1f4b2
Update to 0.4.3.2-alpha-dev
2020-02-10 19:42:31 -05:00
dfa1800c7f
changes file for ticket 33213
2020-02-10 14:24:44 -06:00
725b0528e3
Alphabetized Server Options and Directory Server Options
2020-02-11 01:41:43 +05:30
dcbf6611d9
Correction to changelog from dgoulet
2020-02-10 15:02:32 -05:00
2571d8e7fe
One more light changelog edit.
2020-02-10 15:01:02 -05:00
f275a9ada7
Light edits on the 0.4.3.2-alpha changelog
2020-02-10 14:40:19 -05:00
a0ca442b79
start on 0.4.3.2-alpha changelog
2020-02-10 14:30:36 -05:00
eb8841cd95
Merge branch 'bug33104_041'
2020-02-10 14:23:13 -05:00
0c90fc37ec
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-02-10 14:17:10 -05:00
71c49f7356
Merge branch 'maint-0.4.0' into maint-0.4.1
2020-02-10 14:17:10 -05:00
d9144700af
Merge branch 'maint-0.4.2'
2020-02-10 14:17:10 -05:00
f3fa22bf1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2020-02-10 14:17:09 -05:00
2b6df3da21
Merge branch 'bug33212_035' into maint-0.3.5
2020-02-10 14:17:03 -05:00
dab0b1c3a7
bump to 0.4.3.2-alpha
2020-02-10 13:37:59 -05:00
99d044d553
Fix a Rust compilation warning; resolve bug 33212.
2020-02-10 13:32:09 -05:00
b2c3cb1b26
Add tests for control_event_signal.
2020-02-10 11:38:36 -05:00
05a05773f2
Merge remote-tracking branch 'tor-github/pr/1711'
2020-02-10 10:23:50 -05:00
5e6021bdae
stats: Fix a function comment typo in rephist.c
...
Comment-only change.
2020-02-10 15:58:25 +10:00
cb757b30a2
changes file for tickets 32928, 32929
2020-02-07 12:54:55 -06:00
305934c67b
Updated introductory text for CIRCUIT TIMEOUT and DORMANT MODE options
2020-02-07 16:36:09 +05:30
05adecf211
Added a section for Dormant mode options
2020-02-06 21:33:58 +05:30
21f45197a2
Merge branch 'bug33103'
2020-02-06 08:28:25 -05:00
b7bbff0c9c
Merge remote-tracking branch 'public/practracker_regen_overbroad_2'
2020-02-06 08:27:12 -05:00
a8456d2a11
test: Missing hs_init() in some hs_control tests
...
Without the hs_init(), the caches are not initialized and the previous commit
was causing an assert due to the missing caches.
But regardless of that, those tests were not initializing but were calling
hs_free_all().
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-02-06 12:54:54 +02:00
9278a24729
hs-v3: Remove descriptor when we remove client authorization
...
When the ONION_CLIENT_AUTH_REMOVE command is given to tor, now also remove the
descriptor associated with the client authorization credentials.
Fixes #33148
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-02-06 12:54:54 +02:00
56c54a66bd
Fix a memory leak in handling GETINFO.
...
Fixes bug 33103; bugfix on 0.4.3.1-alpha.
2020-02-05 19:18:32 -05:00
2c4d7d8c65
Merge branch 'pr1701-fix-typo'
2020-02-06 08:39:46 +10:00
teor
Nick Mathewson
Taylor Yu
swati
David Goulet
Alexander Færøy
Christian Clauss