summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
2019-06-14Merge branch 'bug30806'George Kadianakis
2019-06-14Make evloop into a subsystem.Nick Mathewson
2019-06-12Merge branch 'tor-github/pr/1088'George Kadianakis
2019-06-11Merge branch 'tor-github/pr/1040'David Goulet
2019-06-11Rework origin circuit tracking to use pubsubTaylor Yu
2019-06-11Rework orconn tracking to use pubsubTaylor Yu
2019-06-11Merge branch 'tor-github/pr/1031'David Goulet
2019-06-11Merge branch 'tor-github/pr/1083'David Goulet
2019-06-11Merge branch 'maint-0.4.1'David Goulet
2019-06-11Merge branch 'tor-github/pr/1050' into maint-0.4.1David Goulet
2019-06-11Give a compile warning when we don't have any flags for minherit().Nick Mathewson
2019-06-11Give a more useful failure messgae when we fail to minherit().Nick Mathewson
2019-06-11Merge branch 'maint-0.4.1'Nick Mathewson
2019-06-11Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-06-11Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-06-11Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-06-11Update geoip and geoip6 to the June 10 2019 database.Karsten Loesing
2019-06-11Merge branch 'maint-0.4.1'Nick Mathewson
2019-06-11Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1Nick Mathewson
2019-06-11Merge branch 'ticket30769_041_01'George Kadianakis
2019-06-11trunnel: Rename sendme.trunnel to sendme_cell.trunnelDavid Goulet
2019-06-11Merge branch 'ticket30687_042_01'George Kadianakis
2019-06-11token-bucket: Implement a single counter objectDavid Goulet
2019-06-11Merge branch 'maint-0.4.1'George Kadianakis
2019-06-11Merge branch 'tor-github/pr/1065' into maint-0.4.1George Kadianakis
2019-06-11Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5teor
2019-06-10Merge branch 'maint-0.4.1'Nick Mathewson
2019-06-10Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-06-10Merge branch 'maint-0.4.1'Nick Mathewson
2019-06-10Bump master to 0.4.2.0-alpha-devNick Mathewson
2019-06-10test: fix a typo in test_rebind.shteor
2019-06-10Merge branch 'bug30713_035' into bug30713_040teor
2019-06-10Travis: Skip test_rebind on macOS buildsteor
2019-06-07Tolerate net-unreachable failures in util/socketpair_ersatzNick Mathewson
2019-06-06bump to 0.4.1.2-alpha-devNick Mathewson
2019-06-06dirauth: Return a distinct status when formatting annotations failsteor
2019-06-06dirauth: Fix some comments in the router status processing code.teor
2019-06-06Merge branch 'bug30781_040' into bug30781_masterteor
2019-06-06Merge branch 'bug30781_035' into bug30781_040teor
2019-06-06Merge branch 'bug30781_034' into bug30781_035teor
2019-06-06Merge branch 'bug30781_029' into bug30781_034teor
2019-06-06dirparse: Stop crashing when parsing unknown descriptor purpose annotationsteor
2019-06-05Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/1076'Nick Mathewson
2019-06-05Bug 29034: Cleanup hs circuitmap when purpose changes.Mike Perry