summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
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
2020-02-13Merge branch 'bug33195_041' into bug33195_042teor
2020-02-13Merge branch 'bug33195_035' into bug33195_041teor
2020-02-13Travis: Sort jobs in order of speedteor
2020-02-13Travis: Remove a redundant distcheck jobteor
2020-02-13Travis: Require the macOS IPv6 chutney jobteor
2020-02-13Travis: Sort jobs in order of speedteor
2020-02-13Travis: Remove a redundant distcheck jobteor
2020-02-13Travis: Require the macOS IPv6 chutney jobteor
2020-02-13Travis: Only run IPv6 chutney tests on macOSteor
2020-02-13Makefile: Use chutney's latest default networkteor
2020-02-13Makefike: Add an IPv6 test to test-networkteor
2020-02-13Makefile: Split test-network-all into IPv4 and IPv6teor
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
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
2020-02-12test/protover: Test hard-coded protover sortingteor
2020-02-12dirvote: Reorder required protocol liststeor
2020-02-12dirvote: Move required protos into private headerteor
2020-02-12protover: Update a comment about protover parsingteor
2020-02-12scripts/git: Stop running the checked-out git scriptsteor
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
2020-02-12hs-v3: Remove BUG() that can occur normallyDavid Goulet
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
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
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
2020-02-11Remove a redundant practracker exception line in maint-0.4.1Nick Mathewson
2020-02-11Merge branch 'ticket32362_squashed'Nick Mathewson