torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,841 Commits 53 Branches 631 Tags
334469cc39f329701fa48fb752d35a2cee7edc69
Commit Graph

34841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
teor 334469cc39 Merge branch 'bug33195_master' into ticket33280_master 
Conflicts:
* Keep the changes from ticket33280_master
 2020-02-17 13:46:09 +10:00
teor c34c101212 Merge branch 'bug33195_043' into bug33195_master 2020-02-13 14:22:18 +10:00
teor 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
teor 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
teor 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
teor 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
teor fc3555100f Travis: Remove a redundant distcheck job 
Part of 33194.
 2020-02-13 13:45:18 +10:00
teor 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
teor 25ecdf1409 Travis: Sort jobs in order of speed 
Putting the slowest jobs first takes full advantage of Travis
concurrency.

Closes 33194.
 2020-02-13 13:37:54 +10:00
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 e231d84dd5 Merge branch 'maint-0.4.3' 2020-02-12 18:26:08 -05:00
Nick Mathewson d0c3350218 Run "make autostyle". 2020-02-12 18:25:51 -05:00
Nick Mathewson 553c36d153 Merge branch 'maint-0.4.3' 2020-02-12 13:48:48 -05:00
Nick Mathewson 3147cbba52 Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3 2020-02-12 13:48:39 -05:00
Taylor Yu 0ab859aabe changes file for ticket 33188 2020-02-12 12:28:35 -06:00
swati d33c80f0ee Moved [[RephistTrackTime]] to General Options. 2020-02-12 23:17:31 +05:30
swati 809090d24d Addressed minor changes suggested in the ticket 2020-02-12 23:07:00 +05:30
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 tor-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