summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-10-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-10-15Adjust tor_assert_unreached()Nick Mathewson
2018-10-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-10-15Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-10-15Merge branch 'bug27709_029' into maint-0.2.9Nick Mathewson
2018-10-15Explain a bit more about branch prediction in the unit-test caseNick Mathewson
2018-10-10Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-10-10Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-10-10Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9Nick Mathewson
2018-10-10Merge branch 'bug27738-033' into bug27738-034Taylor Yu
2018-10-10Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033Taylor Yu
2018-10-10Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4Nick Mathewson
2018-10-10Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-10-10Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-10-10Update geoip and geoip6 to the October 9 2018 database.Karsten Loesing
2018-10-10fixup! Changes file for apveyor changesNick Mathewson
2018-10-10Changes file for apveyor changesNick Mathewson
2018-10-10Appveyor: Don't try to install the mingw openssl packageNick Mathewson
2018-10-10Install only one of the two mingw architectures in appveyorNick Mathewson
2018-09-24Fix the 0.3.4 part of bug 27781 (arm compilation)Nick Mathewson
2018-09-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-21Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-21Merge branch 'maint-0.2.9' into maint-0.3.2maint-0.3.2Nick Mathewson
2018-09-20Merge remote-tracking branch 'github/bug27139_034' into maint-0.3.4Nick Mathewson
2018-09-18Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-18Merge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3Nick Mathewson
2018-09-18Travis: use the Homebrew addon for xz and zstdteor
2018-09-18Merge branch 'bug27738-029' into bug27738-032teor
2018-09-18Travis: use the Homebrew addonteor
2018-09-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-14Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-14hs-v3: Don't BUG() on directory permission check failureDavid Goulet
2018-09-14Revise our assertion and bug macros to work with -WparenthesesNick Mathewson
2018-09-14rust/protover: delete ProtoSet::retaincypherpunks
2018-09-14rust/protover: use .and_not_in() instead of .retain() in all_supported()cypherpunks
2018-09-14rust/protover: add ProtoSet::and_not_in()cypherpunks
2018-09-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-14If options_act() fails, restore the previous value of global_optionsNick Mathewson
2018-09-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-14Changes file for the 32-bit msec conversion fixes of #27139Nick Mathewson
2018-09-14Make circuitmux ewma timing test more tolerant on 32bit osxNick Mathewson
2018-09-14Avoid integer overflow on fast 32-bit millisecond conversion.Nick Mathewson
2018-09-14Use a slightly more accurate formula for OSX 32-bit msec conversionNick Mathewson
2018-09-14protover: reject invalid protocol namescypherpunks
2018-09-13rust/protover: validate unknown protocol names use only allowed characterscypherpunks
2018-09-13Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-13Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-13Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-13Merge branch 'bug27658_029' into maint-0.2.9Nick Mathewson
2018-09-12Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson