summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-12-05Update geoip and geoip6 to the December 1 2015 database.Karsten Loesing
2015-10-09Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-10-09Update geoip and geoip6 to the October 9 2015 database.Karsten Loesing
2015-09-24Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-09-24Update geoip and geoip6 to the September 3 2015 database.Karsten Loesing
2015-07-29Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-07-29Update geoip and geoip6 to the July 8 2015 database.Karsten Loesing
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-06-25Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4Nick Mathewson
2015-06-25Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-06-17Correctly handle failed crypto_early_initteor
If crypto_early_init fails, a typo in a return value from tor_init means that tor_main continues running, rather than returning an error value. Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha, introduced when implementing #4900. Patch by "teor".
2015-06-09Update geoip6 to the June 3 2015 database.Karsten Loesing
2015-06-09Update geoip to the June 3 2015 database.maint-0.2.3Karsten Loesing
2015-05-13Merge branch 'bug15823_025' into maint-0.2.5Nick Mathewson
2015-05-05Fix 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.
2015-04-27Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-04-27Merge remote-tracking branch 'karsten/geoip6-apr2015' into maint-0.2.4Nick Mathewson
2015-04-27Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-04-24Update geoip6 to the April 8 2015 database.Karsten Loesing
2015-04-24Update geoip to the April 8 2015 database.Karsten Loesing
2015-04-06bump 0.2.5 version to 0.2.5.12Nick Mathewson
2015-04-06Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-04-06Bump 0.2.4 version more placesNick Mathewson
2015-04-06Bump 0.2.4 versionNick Mathewson
2015-04-06Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-04-06Changes file for bug15601Nick Mathewson
2015-04-06Handle empty/zero length encoded intro points more gracefully.Yawning Angel
In theory these should never the triggered as the only caller now validates the parameters before this routine gets called.
2015-04-06Treat empty introduction points sections as missing.Yawning Angel
Found by DonnchaC.
2015-04-06Validate the RSA key size received when parsing INTRODUCE2 cells.Yawning Angel
Fixes bug 15600; reported by skruffy
2015-04-03Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-04-03Merge branch 'bug15515_024' into maint-0.2.4Nick Mathewson
2015-04-03... and if we do get multiple INTRODUCE1s on a circuit, kill the circuitGeorge Kadianakis
(Sending a nak would be pointless.) See ticket 15515 for discussion.
2015-04-03Block multiple introductions on the same intro circuit.George Kadianakis
2015-03-12Revert "Make TransProxyType ipfw work correctly"Nick Mathewson
This reverts commit 681802817deb6fb93b95f8284856fd42f3556600. (I didn't mean to backport this, but somehow I had based my branch for #15205 on it.)
2015-03-12Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5Nick Mathewson
2015-03-12Bump 025 version to 0.2.5.11Nick Mathewson
2015-03-12Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-03-12Bump 0.2.4 version.Nick Mathewson
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-03-09Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4Nick Mathewson
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-03-09Update geoip6 to the March 3 2015 database.Karsten Loesing
2015-03-09Update geoip to the March 3 2015 database.Karsten Loesing
2015-03-09Don't use checked strl{cat,cpy} on OSX.Nick Mathewson
There is a bug in the overlap-checking in strlcat that can crash Tor servers. Fixes bug 15205; this is an OSX bug, not a Tor bug.
2015-03-09Restore c89 in 0.2.5Nick Mathewson
2015-03-09Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5Nick Mathewson
2015-03-09GETINFO bw-event-cache to get information on recent BW eventsNick Mathewson
Closes 14128; useful to regain functionality lost because of 13988.
2015-03-09Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5Nick Mathewson
2015-03-09Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5Nick Mathewson