summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-02-15Bump version in master to 0.3.4.0-alpha-devtor-0.3.4.0-alpha-devNick Mathewson
2018-02-15Merge branch 'protover_rust_compat_v3'Nick Mathewson
2018-02-15rust protover: match the C implementation on empty-str casesNick Mathewson
2018-02-15Forbid u32::MAX as a protover range element in rustNick Mathewson
2018-02-15Rust protover compat: forbid more than MAX_VERSIONS_TO_EXPAND in a rangeNick Mathewson
2018-02-14Merge remote-tracking branch 'mikeperry/bug24769'Nick Mathewson
2018-02-13Merge branch 'tests_rust'Nick Mathewson
2018-02-13Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-13Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-13fix make check-changesTaylor Yu
2018-02-13Merge remote-tracking branch 'dgoulet/ticket24902_029_05'Nick Mathewson
2018-02-13Make check-changes happyDavid Goulet
2018-02-13man: Document default values if not in the consensus for DoS mitigationDavid Goulet
2018-02-13Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05David Goulet
2018-02-13dos: Add extra safety asserts in cc_stats_refill_bucket()David Goulet
2018-02-13dos: Don't set consensus param if we aren't a public relayDavid Goulet
2018-02-13Remove 25170 changes file from master: it was already merged in 0.3.3.2-alphaNick Mathewson
2018-02-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-13Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-13Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-13dirserv: Improve returned message when relay is rejectedDavid Goulet
2018-02-13Merge remote-tracking branch 'dgoulet/ticket24902_029_05'Nick Mathewson
2018-02-12Have tor_addr hashes return a randomized hash for AF_UNSPEC.Nick Mathewson
2018-02-12Fix a typo in an address_set.c comment.Nick Mathewson
2018-02-12Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-12Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-12Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-12Merge branch 'bug23318-redux_029' into maint-0.2.9Nick Mathewson
2018-02-11Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-11Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-11Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9Nick Mathewson
2018-02-11Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-11Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-11Merge branch 'ticket24315_029' into maint-0.2.9Nick Mathewson
2018-02-11Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-11Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-11Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9Nick Mathewson
2018-02-11Merge remote-tracking branch 'isis/bug25127_redux'Nick Mathewson
2018-02-11fix compilation.Nick Mathewson
2018-02-11chnages file for 25120Nick Mathewson
2018-02-11Merge branch 'bug25120'Nick Mathewson
2018-02-11Lower log-level in different error conditions in entropy selection.Alexander Færøy
2018-02-10Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-10Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-10Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-10Merge branch 'bug24978_029_enable' into maint-0.2.9Nick Mathewson