aboutsummaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Expand)Author
2017-06-29Merge branch 'maint-0.3.1'Nick Mathewson
2017-06-29Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-06-29Merge branch 'trove-2017-006' into maint-0.3.0Nick Mathewson
2017-06-29Merge branch 'maint-0.3.1'Nick Mathewson
2017-06-29Merge remote-tracking branch 'public/bug22670_031' into maint-0.3.1Nick Mathewson
2017-06-29Merge branch 'maint-0.3.1'Nick Mathewson
2017-06-29Merge branch 'ticket22684'Nick Mathewson
2017-06-29Consider the exit family when applying guard restrictions.Nick Mathewson
2017-06-28Replace crash on missing handle in consdiffmgr with nonfatal assertNick Mathewson
2017-06-28Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-28Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9Nick Mathewson
2017-06-28Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9Nick Mathewson
2017-06-28whitespace fixNick Mathewson
2017-06-28Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0Nick Mathewson
2017-06-27Merge branch 'maint-0.3.1'Nick Mathewson
2017-06-27Return "304 not modified" if a client already have the most recent consensus.Alexander Færøy
2017-06-27Set published_out for consensus cache entries in spooled_resource_estimate_si...Alexander Færøy
2017-06-27Merge branch 'asn_bug22006_final_squashed'Nick Mathewson
2017-06-27ed25519: Dirauths validate router ed25519 pubkeys before pinning.George Kadianakis
2017-06-27Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-27Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-27Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-06-27Merge branch 'maint-0.3.1'Nick Mathewson
2017-06-27Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-06-27Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-06-27Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-06-27Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-27Fix an errant memset() into the middle of a struct in cell_pack().Nick Mathewson
2017-06-27Merge branch 'maint-0.3.1'Nick Mathewson
2017-06-27Merge branch 'bug22719_031' into maint-0.3.1Nick Mathewson
2017-06-26Merge branch 'maint-0.3.1'Nick Mathewson
2017-06-26Patch for 22720 from huyvq: exit(1) more oftenNick Mathewson
2017-06-26Merge branch 'maint-0.3.1'Nick Mathewson
2017-06-26Merge branch 'bug22212_squashed' into maint-0.3.1Nick Mathewson
2017-06-26Demote a log message due to libevent delays.Mike Perry
2017-06-26Try a little harder to make sure we never call tor_compress_process wrong.Nick Mathewson
2017-06-23Merge remote-tracking branch 'isis/bug4019'Nick Mathewson
2017-06-23Merge branch 'bug3056_squashed'Nick Mathewson
2017-06-23Improve clarity, safety, and rate of dns spoofing log msgNick Mathewson
2017-06-22Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-06-22Merge branch 'maint-0.3.1'Nick Mathewson
2017-06-22Combine our "don't do this if no consensus" entryguards checksNick Mathewson
2017-06-22Merge remote-tracking branch 'rl1987/bug22461'Nick Mathewson
2017-06-22Merge remote-tracking branch 'public/bug7890'Nick Mathewson
2017-06-22config: Fix duplicate error message for nonlocal SocksPorts.Isis Lovecruft
2017-06-21make assign_onionskin_to_cpuworker failure case more clearRoger Dingledine
2017-06-21Merge branch 'callgraph_reduction_v2'Nick Mathewson
2017-06-21Add GETINFO targets to determine whether md/desc fetching is enabledNick Mathewson
2017-06-21Extract channel_do_open_actions() from non-open _change_state casesNick Mathewson
2017-06-21Merge branch 'maint-0.3.1'Nick Mathewson