summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-06-25Fold 30956 into changelog; update dateNick Mathewson
2019-06-24Merge branch 'maint-0.4.1' into release-0.4.1Nick Mathewson
2019-06-24Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1Nick Mathewson
2019-06-24Merge branch 'maint-0.4.1' into release-0.4.1Nick Mathewson
2019-06-24bump to 0.4.1.3-alphaNick Mathewson
2019-06-24Begin a changelog for 0.4.1.3-alphaNick Mathewson
2019-06-24stats: Always publish pluggable transports in extra info documentsteor
2019-06-19remove practracker from check-local (0.4.1 only)Nick Mathewson
2019-06-19Make the great grand practracker happy...David Goulet
2019-06-19guard: Ignore marked for close circuit when changing state to openDavid Goulet
2019-06-15Fix memleak when failing to parse a CSV_INTERVAL.Nick Mathewson
2019-06-12Add a chutney mode to travis.yml.Nick Mathewson
2019-06-12Travis: control "make check" with its own flagNick Mathewson
2019-06-11Merge branch 'tor-github/pr/1050' into maint-0.4.1David Goulet
2019-06-11Add a changes file for ticket 30686.Nick Mathewson
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.3.5' into maint-0.4.0Nick Mathewson
2019-06-11Merge branch 'maint-0.4.0' into maint-0.4.1Nick 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 remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1Nick Mathewson
2019-06-11circpad: some more logging changes.George Kadianakis
2019-06-11Merge branch 'tor-github/pr/1065' into maint-0.4.1George Kadianakis
2019-06-11Merge branch 'maint-0.4.0' into maint-0.4.1teor
2019-06-11Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/971' 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.0' into maint-0.4.1Nick Mathewson
2019-06-10Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0Nick Mathewson
2019-06-10Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-06-10Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1Nick Mathewson
2019-06-10Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1Nick 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-10Travis: allow the test-stem job to failteor
2019-06-06bump to 0.4.1.2-alpha-devNick Mathewson
2019-06-06practracker: accept 3 extra lines in router_parse_entry_from_string()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 branch 'maint-0.4.0'tor-0.4.1.2-alphaNick Mathewson
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/989' into maint-0.4.0Nick Mathewson