summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-28Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
This is an "ours" merge to avoid taking a version bump, and to avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.
2017-02-28bump version to 0.2.8.13Nick Mathewson
2017-02-28Bump version to 0.2.7.7Nick Mathewson
2017-02-28Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
"ours" merge to avoid version bumps
2017-02-28bump to 0.2.6.11Nick Mathewson
2017-02-28Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
"ours" merge to avoid version bumps
2017-02-28Bump version to 0.2.5.13Nick Mathewson
2017-02-28Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
"ours" merge to avoid bumping version
2017-02-28Bump to 0.2.4.28Nick Mathewson
2017-02-17Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-02-15Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2017-02-15Merge branch 'maint-0.2.6' into maint-0.2.7maint-0.2.7Nick Mathewson
2017-02-15Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-02-15Merge branch 'maint-0.2.8' of git-rw.torproject.org:/tor into maint-0.2.8Nick Mathewson
2017-02-15Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7Nick Mathewson
2017-02-15Merge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6Nick Mathewson
2017-02-15Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5Nick Mathewson
2017-02-15Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2017-02-15Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2017-02-15Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-02-15Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-02-14Avoid integer underflow in tor_version_compare.Nick Mathewson
Fix for TROVE-2017-001 and bug 21278. (Note: Instead of handling signed ints "correctly", we keep the old behavior, except for the part where we would crash with -ftrapv.)
2017-02-13Merge branch 'maint-0.2.7' into maint-0.2.8Roger Dingledine
2017-02-13Merge branch 'maint-0.2.6' into maint-0.2.7Roger Dingledine
2017-02-13Merge branch 'maint-0.2.5' into maint-0.2.6Roger Dingledine
2017-02-13Merge branch 'maint-0.2.4' into maint-0.2.5Roger Dingledine
2017-02-13be sure to remember the changes file for #20384Roger Dingledine
2017-02-13Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2017-02-13Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2017-02-13Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-02-13Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-02-12Update geoip and geoip6 to the February 8 2017 database.Karsten Loesing
2017-02-07Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2017-02-07Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2017-02-07Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-02-07Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-02-07Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5Nick Mathewson
2017-02-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-02-07Revert "Revert "Add hidserv-stats filname to our sandbox filter""Nick Mathewson
This reverts commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661. The underlying revert was done in 0.2.6, since we aren't backporting seccomp2 loosening fixes to 0.2.6. But the fix (for 17354) already went out in 0.2.7.4-rc, so we shouldn't revert it in 0.2.7.
2017-02-07Bump the version to 0.2.7.6-dev againNick Mathewson
2017-02-07Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
maint-0.2.7-redux is an attempt to try to re-create a plausible maint-0.2.7 branch. I've started from the tor-0.2.7.6, and then I merged maint-0.2.6 into the branch. This has produced 2 conflicts: one related to the rendcommon->rendcache move, and one to the authority refactoring.
2017-02-07Disable a log_backtrace (which 0.2.4 does not have) in 16248 fixNick Mathewson
2017-02-07Add comments to connection_check_event().Nick Mathewson
2017-02-07Change behavior on missing/present event to warn instead of asserting.Nick Mathewson
Add a changes file.
2017-02-07If we start/stop reading on a dnsserv connection, don't assert.Nick Mathewson
Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha.
2017-02-07Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2017-02-07Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
"ours" merge to avoid reverting 17354, which was already fixed in 0.2.7.4-rc.
2017-02-07Revert "Add hidserv-stats filname to our sandbox filter"Nick Mathewson
Reverting this in 0.2.6 only -- we're no backporting seccomp2-loosening fixes to 0.2.6. This reverts commit 2ec5e24c58a08816ed2f09c8bd6301599bc2f2f7.
2017-02-07Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2017-02-07Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
This is an "ours" merge to avoid conflicts on the authority list: the 0.2.7 branch already has the tonga->bifroest merge.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion