summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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.
2020-02-12scripts/git: Stop running the checked-out git scriptsteor
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-12Merge branch 'maint-0.4.3'teor
2020-02-12Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3teor
2020-02-12Merge branch 'maint-0.4.2' into maint-0.4.3teor
"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-12hs-v3: Remove BUG() that can occur normallyDavid Goulet
Fixes #28992 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-02-12Merge branch 'maint-0.4.1' into maint-0.4.2teor
2020-02-12Merge branch 'maint-0.3.5' into maint-0.4.1teor
2020-02-12Lowercase the BridgeDistribution value from torrc in descriptors.Alexander Færøy
This patch ensures that we always lowercase the BridgeDistribution from torrc in descriptors before submitting it. See: https://bugs.torproject.org/32753
2020-02-12Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5teor
2020-02-11Merge branch 'tor-github/pr/1707'George Kadianakis
2020-02-11hs-v3: Remove BUG() that can occur normallyDavid Goulet
Fixes #28992 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-02-11Merge branch 'tor-github/pr/1717'David Goulet
2020-02-11Update scripts/git/*.sh to know about 043 and not about 040.Nick Mathewson
2020-02-11Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
2020-02-11Merge branch 'maint-0.4.3'Nick Mathewson
2020-02-11Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
"ours" merge, since the exceptions.txt file is already fixed in this branch.
2020-02-11Remove a redundant practracker exception line in maint-0.4.1Nick Mathewson
This will our "git push" hook not complain about pushing from maint-0.4.1.
2020-02-11Merge branch 'ticket32362_squashed'Nick Mathewson
2020-02-11Check for leading zeros in tor_inet_aton()Neel Chauhan
2020-02-11Merge remote-tracking branch 'tor-github/pr/1690/head'Nick Mathewson
2020-02-11Merge branch 'maint-0.4.3'Nick Mathewson
2020-02-11Merge remote-tracking branch 'tor-github/pr/1716/head' into maint-0.4.3Nick Mathewson
2020-02-11Merge branch 'maint-0.4.3'Nick Mathewson
2020-02-11Undefined name: make_key() -> make_rsa_key()Christian Clauss
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion