summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-01Fold in the geoip changes filetor-0.3.1.5-alphaNick Mathewson
2017-08-01Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9Nick Mathewson
2017-08-01Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9Nick Mathewson
2017-08-01Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0Nick Mathewson
2017-08-01Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9Nick Mathewson
2017-08-01Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9Nick Mathewson
2017-08-01Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-01Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-08-01Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-08-01Merge branch 'maint-0.2.6' into maint-0.2.7-reduxmaint-0.2.7-reduxNick Mathewson
2017-08-01Merge branch 'maint-0.2.5' into maint-0.2.6maint-0.2.6Nick Mathewson
2017-08-01Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-08-01Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4maint-0.2.4Nick Mathewson
2017-07-31Add the release blurbNick Mathewson
2017-07-31Changelog fixesNick Mathewson
2017-07-31Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-07-31Bump to 0.3.1.5-alphaNick Mathewson
2017-07-31Light editing to 0.3.1.x changelogNick Mathewson
2017-07-31Start work on 0.3.1.5-x changelogNick Mathewson
2017-07-31Fix warnings from lintchangesNick Mathewson
2017-07-28Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-07-28Fix an unreachable memory leak in the unit testsNick Mathewson
This is CID 1415726.
2017-07-28Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-07-28Merge branch 'bug23053_029' into maint-0.3.1Nick Mathewson
2017-07-28Fix a small memory leak when parsing unix: ports twiceNick Mathewson
Fixes bug 23053; CID 1415725.
2017-07-27Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-07-27Try to work around a compile warning in workqueue.cNick Mathewson
2017-07-27Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-07-27Merge branch 'multi-priority_squashed' into maint-0.3.1Nick Mathewson
2017-07-27Fix the cpuworker.c documentation to mention all the kinds of workNick Mathewson
2017-07-27Note that threadpool_queue_work...() can't actually return NULLNick Mathewson
2017-07-27Always start with one additional worker threadNick Mathewson
Now that half the threads are permissive and half are strict, we need to make sure we have at least two threads, so that we'll have at least one of each kind.
2017-07-27Queue consensus diffs at LOW priority.Nick Mathewson
Fixes bug 22883.
2017-07-27Fix a pair of stale comments in workqueue.cNick Mathewson
These comments said that each thread had a separate queue, but we haven't been using that design for some while.