teor
9ba147e9af
Travis: Remove a redundant distcheck job
...
Part of 33194.
2020-02-13 13:37:51 +10:00
teor
82bacca4e0
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:37:39 +10:00
teor
c847b9f1a6
Travis: Only run IPv6 chutney tests on macOS
...
Run the test-network-ipv6 Makefile target in the Travis CI IPv6 chutney
job. This job runs on macOS, so it's a bit slow.
Closes ticket 33303.
2020-02-13 13:12:02 +10:00
teor
02f494360a
Makefile: Use chutney's latest default network
...
Use bridges+hs-v23 for "make test-network",
rather than using chutney's old default.
This change requires a recent version of chutney,
because the old bridges+hs-v23 did not work.
(See chutney's 33302 for details.)
Closes 28208.
2020-02-13 13:00:18 +10:00
teor
9d352028e6
Makefike: Add an IPv6 test to test-network
...
The IPv6 test only runs if IPv6 is available.
Also, explicitly use the bridges+hs-v2 network for the IPv4-only test.
This network was chutney's default as of January 2020.
Closes 33300.
2020-02-13 13:00:15 +10:00
teor
c33ffe013b
Makefile: Split test-network-all into IPv4 and IPv6
...
Add test-network-ipv4 and test-network-ipv6 tests to the Makefile.
These tests run the IPv4-only and dual-stack chutney flavours from
test-network-all.
Closes ticket 33280.
2020-02-13 12:59:57 +10:00
Nick Mathewson
9b2e0604a9
Merge remote-tracking branch 'tor-github/pr/1726/head'
2020-02-12 08:34:17 -05:00
teor
bc493ce0f2
protover: Update a comment about protover parsing
...
Comment-only change.
2020-02-12 20:59:25 +10:00
teor
99d957696b
scripts/git: Stop running the checked-out git scripts
...
Stop executing the checked-out pre-commit hook from the pre-push hook.
Instead, execute the copy in the user's git dir.
Fixes bug 33284; bugfix on 0.4.1.1-alpha.
2020-02-12 20:37:21 +10:00
teor
41a9eddf2b
Merge branch 'maint-0.4.3'
2020-02-12 14:15:27 +10:00
teor
e0ea7407a4
Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3
2020-02-12 14:14:11 +10:00
teor
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
David Goulet
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
teor
ff52205362
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-02-12 12:22:04 +10:00
teor
5298113da9
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-02-12 12:21:57 +10:00
Alexander Færøy
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
teor
88723ad169
Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5
2020-02-12 12:18:59 +10:00
George Kadianakis
9892cc3b12
Merge branch 'tor-github/pr/1707'
2020-02-11 18:42:22 +02:00
David Goulet
40a321659a
hs-v3: Remove BUG() that can occur normally
...
Fixes #28992
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-02-11 18:40:55 +02:00
David Goulet
2a524662c3
Merge branch 'tor-github/pr/1717'
2020-02-11 10:52:49 -05:00
Nick Mathewson
7404b6fb71
Update scripts/git/*.sh to know about 043 and not about 040.
2020-02-11 10:52:42 -05:00
Nick Mathewson
de31c4757b
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-02-11 08:53:41 -05:00
Nick Mathewson
80c5c874cc
Merge branch 'maint-0.4.3'
2020-02-11 08:53:41 -05:00
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
384a771fcc
Merge branch 'ticket32362_squashed'
2020-02-11 08:47:19 -05:00
Neel Chauhan
777d90fa23
Check for leading zeros in tor_inet_aton()
2020-02-11 08:47:13 -05:00
Nick Mathewson
d9a70ba212
Merge remote-tracking branch 'tor-github/pr/1690/head'
2020-02-11 08:45:25 -05:00
Nick Mathewson
48bf3aec25
Merge branch 'maint-0.4.3'
2020-02-11 08:44:39 -05:00
Nick Mathewson
409e1ca3d5
Merge remote-tracking branch 'tor-github/pr/1716/head' into maint-0.4.3
2020-02-11 08:44:18 -05:00
Nick Mathewson
1ca6c52209
Merge branch 'maint-0.4.3'
2020-02-11 08:35:22 -05:00
Christian Clauss
9f7e1ccacb
Undefined name: make_key() -> make_rsa_key()
2020-02-11 08:35:11 -05:00
Nick Mathewson
71d96cefc0
Update to 0.4.4.0-alpha-dev
2020-02-10 19:43:54 -05:00
Nick Mathewson
dac185edba
Merge branch 'maint-0.4.3'
...
"ours" merge to avoid version bump.
2020-02-10 19:43:17 -05:00
Nick Mathewson
5d56c1f4b2
Update to 0.4.3.2-alpha-dev
2020-02-10 19:42:31 -05:00
Taylor Yu
dfa1800c7f
changes file for ticket 33213
2020-02-10 14:24:44 -06:00
Nick Mathewson
dcbf6611d9
Correction to changelog from dgoulet
2020-02-10 15:02:32 -05:00
Nick Mathewson
2571d8e7fe
One more light changelog edit.
2020-02-10 15:01:02 -05:00
Nick Mathewson
f275a9ada7
Light edits on the 0.4.3.2-alpha changelog
2020-02-10 14:40:19 -05:00
Nick Mathewson
a0ca442b79
start on 0.4.3.2-alpha changelog
2020-02-10 14:30:36 -05:00
Nick Mathewson
eb8841cd95
Merge branch 'bug33104_041'
2020-02-10 14:23:13 -05:00
Nick Mathewson
0c90fc37ec
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-02-10 14:17:10 -05:00
Nick Mathewson
71c49f7356
Merge branch 'maint-0.4.0' into maint-0.4.1
2020-02-10 14:17:10 -05:00
Nick Mathewson
d9144700af
Merge branch 'maint-0.4.2'
2020-02-10 14:17:10 -05:00
Nick Mathewson
f3fa22bf1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2020-02-10 14:17:09 -05:00
Nick Mathewson
2b6df3da21
Merge branch 'bug33212_035' into maint-0.3.5
2020-02-10 14:17:03 -05:00
Nick Mathewson
dab0b1c3a7
bump to 0.4.3.2-alpha
2020-02-10 13:37:59 -05:00
Nick Mathewson
99d044d553
Fix a Rust compilation warning; resolve bug 33212.
2020-02-10 13:32:09 -05:00
Nick Mathewson
b2c3cb1b26
Add tests for control_event_signal.
2020-02-10 11:38:36 -05:00
Nick Mathewson
05a05773f2
Merge remote-tracking branch 'tor-github/pr/1711'
2020-02-10 10:23:50 -05:00
