summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-18Merge branch 'tor-github/pr/1743'David Goulet
2020-02-18lintChanges: Tolerate variants that sortChanges knows how to clean up.Nick Mathewson
2020-02-18Merge branch 'tor-github/pr/1740'David Goulet
2020-02-17Merge remote-tracking branch 'tor-github/pr/1731'teor
2020-02-17Makefile: Hide some recursive make logsteor
These logs break up the chutney test output. Part of 33280.
2020-02-17Makefile: Quote test-network variable expansionsteor
Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-17Travis: Make Chutney output more readableteor
* Use a shorter name for the chutney make target * Put the chutney make target first, when using a custom target Part of 33280.
2020-02-17Merge branch 'bug33195_master' into ticket33280_masterteor
Conflicts: * Keep the changes from ticket33280_master
2020-02-16Stop assuming that /usr/bin/python existsPanagiotis Vasilopoulos
Fixes 33192
2020-02-14Script to check sorting of manpage entriesTaylor Yu
Add a script to help check the alphabetical ordering of option names in a manpage. Closes ticket 33339.
2020-02-14Merge remote-tracking branch 'tor-github/pr/1727/head'Nick Mathewson
2020-02-14Merge branch 'maint-0.4.3'Nick Mathewson
2020-02-14Merge branch 'ticket33290_v2_042' into maint-0.4.3Nick Mathewson
2020-02-14Merge branch 'ticket33290_v2_041' into ticket33290_v2_042Nick Mathewson
2020-02-14Wipe the entire hashent structure, not just the first sizeof(void*)Nick Mathewson
2020-02-14dirvote: Update the comments for required protocolsteor
Add doxygen comments to the new recommended and required subprotocol version strings. Add a warning to the required protocol documentation, because requiring the wrong protocols can break the tor network. Also reference proposal 303: When and how to remove support for protocol versions. Part of 33285.
2020-02-14mainloop: Explain local connections betterteor
Some connections aren't counted for statistics or accounting, because they have been specifically configured by the user to local addresses. Comment-only change. Closes 33201.
2020-02-13Merge branch 'maint-0.4.3'Nick Mathewson
2020-02-13Merge branch 'ticket33290_v2_043' into maint-0.4.3Nick Mathewson
2020-02-13Merge branch 'ticket33290_v2_042' into ticket33290_v2_043Nick Mathewson
Conflicts: src/core/or/circuitmux_ewma.c
2020-02-13Merge branch 'ticket33290_v2_041' into ticket33290_v2_042Nick Mathewson
2020-02-13Before freeing ewma objects, use memwipe instead of resetting magic.Nick Mathewson
2020-02-13Merge branch 'bug33195_043' into bug33195_masterteor
2020-02-13Merge branch 'bug33195_042' into bug33195_043teor
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-13Merge branch 'bug33195_041' into bug33195_042teor
Conflicts: * Keep RUST_VERSION from maint-0.4.2 * Keep the commented-out allow_failure entries from bug33195_041
2020-02-13Merge branch 'bug33195_035' into bug33195_041teor
Conflicts: * Keep TOR_TEST_RNG_SEED from maint-0.4.1 * Keep the ordering from bug33195_035
2020-02-13Travis: Sort jobs in order of speedteor
Putting the slowest jobs first takes full advantage of Travis concurrency. Closes 33194.
2020-02-13Travis: Remove a redundant distcheck jobteor
Part of 33194.
2020-02-13Travis: Require the macOS IPv6 chutney jobteor
The job was previously set to fast_finish / allow_failure, to speed up the build. Closes ticket 33195.
2020-02-13Travis: Sort jobs in order of speedteor
Putting the slowest jobs first takes full advantage of Travis concurrency. Closes 33194.
2020-02-13Travis: Remove a redundant distcheck jobteor
Part of 33194.
2020-02-13Travis: Require the macOS IPv6 chutney jobteor
The job was previously set to fast_finish / allow_failure, to speed up the build. Closes ticket 33195.
2020-02-13Travis: Only run IPv6 chutney tests on macOSteor
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-13Makefile: Use chutney's latest default networkteor
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-13Makefike: Add an IPv6 test to test-networkteor
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-13Makefile: Split test-network-all into IPv4 and IPv6teor
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-12Merge branch 'maint-0.4.3'Nick Mathewson
2020-02-12Run "make autostyle".Nick Mathewson
2020-02-12Use more memory poisoning and better asserts around ewma codeNick Mathewson
Attempt to diagnose 32464; fixes 33290.
2020-02-12Merge branch 'maint-0.4.3'Nick Mathewson
2020-02-12Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3Nick Mathewson
2020-02-12changes file for ticket 33188Taylor Yu
2020-02-12Moved [[RephistTrackTime]] to General Options.swati
2020-02-12Addressed minor changes suggested in the ticketswati
2020-02-12Merge remote-tracking branch 'tor-github/pr/1726/head'Nick Mathewson
2020-02-12protover: Sort tor's supported protocol versionsteor
As recommended by the tor directory specification. Fixes bug 33285; bugfix on 0.4.0.1-alpha.
2020-02-12test/protover: Test hard-coded protover sortingteor
Make sure that the following hard-coded protocol version lists are sorted: * supported protocols * recommended relay and client protocols * required relay and client protocols This test currently fails, because the supported protocols are not sorted. Tests for 33285.
2020-02-12dirvote: Reorder required protocol liststeor
Use a consistent order, because the current order is going to trip someone up eventually. Preparation for 33285.
2020-02-12dirvote: Move required protos into private headerteor
Move the recommended and required protocol version lists into the private section of the dirvote header, and turn them into macros. Preparation for 33285.
2020-02-12protover: Update a comment about protover parsingteor
Comment-only change.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion