aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-05-08Update geoip and geoip6 to the May 2 2017 database.Karsten Loesing
2017-04-06Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-04-06Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-04-06Update geoip and geoip6 to the April 4 2017 database.Karsten Loesing
2017-03-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-03-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-03-08Update geoip and geoip6 to the March 7 2017 database.Karsten Loesing
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-15Merge branch 'maint-0.2.5' into maint-0.2.6Nick 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.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.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.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.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-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-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.5' into maint-0.2.6Nick Mathewson
2017-02-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-02-07Backport the tonga->bifroest move to 0.2.4.Nick Mathewson
This is a backport of 19728 and 19690
2017-02-07Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-02-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-02-07Merge remote-tracking branch 'public/bug19152_024_v2' into maint-0.2.4Nick Mathewson
2017-02-07Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-02-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-02-07Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4Nick Mathewson
2017-02-07Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-02-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-02-07Refine the memwipe() arguments check for 18089 a little more.Nick Mathewson
We still silently ignore memwipe(NULL, ch, 0); and memwipe(ptr, ch, 0); /* for ptr != NULL */ But we now assert on: memwipe(NULL, ch, 30);
2017-02-07Make memwipe() do nothing when passed a NULL pointer or zero sizeteor (Tim Wilson-Brown)
Check size argument to memwipe() for underflow. Closes bug #18089. Reported by "gk", patch by "teor". Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352), commit 49dd5ef3 on 7 Nov 2012.
2017-02-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-02-07Fix out-of-bounds read in INTRODUCE2 client authJohn Brooks
The length of auth_data from an INTRODUCE2 cell is checked when the auth_type is recognized (1 or 2), but not for any other non-zero auth_type. Later, auth_data is assumed to have at least REND_DESC_COOKIE_LEN bytes, leading to a client-triggered out of bounds read. Fixed by checking auth_len before comparing the descriptor cookie against known clients. Fixes #15823; bugfix on 0.2.1.6-alpha.
2017-01-11Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-01-11Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion