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
36,195 Commits 53 Branches 631 Tags
e4ef3c61f7fd718da94deace0b67950c6f788859
Commit Graph

9527 Commits

Author SHA1 Message Date
Taylor Yu 7160a7218d changes file for ticket 33369 2020-02-20 17:13:02 -06:00
Nick Mathewson 7ba7f9c0de Merge branch 'maint-0.4.3' 2020-02-20 10:44:43 -05:00
Nick Mathewson 7b42502869 Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3 2020-02-20 10:44:36 -05:00
Nick Mathewson 626eb025b6 Merge remote-tracking branch 'tor-github/pr/1745/head' 2020-02-20 09:14:40 -05:00
Nick Mathewson 09fb7987c5 Merge branch 'maint-0.4.3' 2020-02-20 08:50:18 -05:00
Nick Mathewson f733b8acd6 Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3 2020-02-20 08:48:17 -05:00
Nick Mathewson b9cc4cc50a Merge branch 'ticket4631_squashed' 2020-02-20 08:17:47 -05:00
Nick Mathewson a65efa7e83 Merge branch 'extract_relay_dns' 2020-02-19 13:58:53 -05:00
Nick Mathewson 65b75ef3d5 Merge branch 'extract_ext_orport' 2020-02-19 13:55:18 -05:00
Nick Mathewson 7b6e81f8e6 Merge branch 'extract_selftest' 2020-02-19 11:58:17 -05:00
Nick Mathewson dca2c00aca Merge remote-tracking branch 'tor-github/pr/1755/head' 2020-02-19 11:39:05 -05:00
teor 4dd594d33c Merge remote-tracking branch 'tor-github/pr/1744' 2020-02-19 10:09:29 +10:00
teor 57ff8d4a53 practracker: Read unicode files when using Python 2 
Allow the "practracker" coding best practices checking script to read
unicode files, when using Python 2.

We made the script use unicode literals in 0.4.3.1-alpha, but didn't
change the codec for opening files.

Fixes bug 33374; bugfix on 0.4.3.1-alpha.
 2020-02-19 08:22:01 +10:00
Taylor Yu 5164709f90 changes file for ticket 33275 2020-02-18 13:34:46 -06:00
David Goulet f0561861e3 Merge branch 'tor-github/pr/1746' 2020-02-18 13:57:03 -05:00
Steven Engler 9a68eca3a7 Small changes to scheduler comments and state changes 
Tries to make some of the comments in scheduler.c easier to follow,
and simplifies a couple of the scheduler channel state changes.
 2020-02-18 13:56:58 -05:00
Nick Mathewson e85f46b7be Do not build selftest.c when running relay mode is disabled. 2020-02-18 13:31:33 -05:00
Nick Mathewson a1a3a4d585 Make ext_orport.c relay-mode-only. 2020-02-18 13:23:50 -05:00
Nick Mathewson c43a245292 Disable dns.c when relay mode is disabled. 
This saves about 1% for me on a binary compiled without relay mode.

Closes ticket 33366.
 2020-02-18 12:46:10 -05:00
Nick Mathewson 93af83e16a Remember dirctory bw usage, and log it in the heartbeat 
Closes ticket 32720.
 2020-02-18 11:25:18 -05:00
David Goulet 17724a7cde Merge branch 'tor-github/pr/1743' 2020-02-18 09:06:13 -05:00
David Goulet f24959df1d Merge branch 'tor-github/pr/1740' 2020-02-18 08:46:52 -05:00
teor e540a4147f changes: file for 4631 2020-02-18 13:23:30 +10:00
teor d71090f8e3 Travis: Produce detailed chutney diagnostics 
When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
to produce detailed diagnostic output.

Closes ticket 32792.
 2020-02-17 17:21:13 +10:00
teor da280a4309 Makefile: Add an IPv6 mixed chutney network 
This network is used in make test-network-all and test-network-ipv6.

Closes 33334.
 2020-02-17 14:55:05 +10:00
teor f231827946 Merge remote-tracking branch 'tor-github/pr/1731' 2020-02-17 13:49:23 +10:00
teor 334469cc39 Merge branch 'bug33195_master' into ticket33280_master 
Conflicts:
* Keep the changes from ticket33280_master
 2020-02-17 13:46:09 +10:00
Panagiotis Vasilopoulos 674a821fbb Stop assuming that /usr/bin/python exists 
Fixes 33192
 2020-02-16 21:58:01 +02:00
Taylor Yu 55f088bb29 Script to check sorting of manpage entries 
Add a script to help check the alphabetical ordering of option names
in a manpage.  Closes ticket 33339.
 2020-02-14 11:02:16 -06:00
Nick Mathewson a6509cb867 Merge remote-tracking branch 'tor-github/pr/1727/head' 2020-02-14 08:20:21 -05:00
Nick Mathewson 1ab7c05231 Merge branch 'maint-0.4.3' 2020-02-13 10:47:43 -05:00
Nick Mathewson baeff46d36 Merge branch 'ticket33290_v2_042' into ticket33290_v2_043 
Conflicts:
	src/core/or/circuitmux_ewma.c
 2020-02-13 09:21:47 -05:00
Nick Mathewson fd1686c7d8 Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 2020-02-13 09:12:48 -05: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 80e3dc4727 Use more memory poisoning and better asserts around ewma code 
Attempt to diagnose 32464; fixes 33290.
 2020-02-12 14:17:19 -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