summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-28Merge branch 'maint-0.2.4' into release-0.2.4tor-0.2.4.23Roger Dingledine
Conflicts: configure.ac contrib/tor-mingw.nsi.in src/win32/orconfig.h
2014-07-28bump to 0.2.4.23Roger Dingledine
2014-07-28give it a release blurbRoger Dingledine
2014-07-28fold in changes entriesRoger Dingledine
2014-07-28Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2014-07-28Warn and drop the circuit if we receive an inbound 'relay early' cellRoger Dingledine
Those used to be normal to receive on hidden service circuits due to bug 1038, but the buggy Tor versions are long gone from the network so we can afford to resume watching for them. Resolves the rest of bug 1038; bugfix on 0.2.1.19.
2014-07-27add a changes file for bug 12718Roger Dingledine
2014-07-27Confusing log message when circuit can't be extendedArlo Breault
2014-07-25circuit_build_failed: distinguish "first hop chan failed", "CREATE failed"Nick Mathewson
Roger spotted this on tor-dev in his comments on proposal 221. (Actually, detect DESTROY vs everything else, since arma likes network timeout indicating failure but not overload indicating failure.)
2014-07-25Implement proposal 221: Stop sending CREATE_FASTNick Mathewson
This makes FastFirstHopPK an AUTOBOOL; makes the default "auto"; and makes the behavior of "auto" be "look at the consensus."
2014-07-24Avoid illegal read off end of an array in prune_v2_cipher_listNick Mathewson
This function is supposed to construct a list of all the ciphers in the "v2 link protocol cipher list" that are supported by Tor's openssl. It does this by invoking ssl23_get_cipher_by_char on each two-byte ciphersuite ID to see which ones give a match. But when ssl23_get_cipher_by_char cannot find a match for a two-byte SSL3/TLS ciphersuite ID, it checks to see whether it has a match for a three-byte SSL2 ciphersuite ID. This was causing a read off the end of the 'cipherid' array. This was probably harmless in practice, but we shouldn't be having any uninitialized reads. (Using ssl23_get_cipher_by_char in this way is a kludge, but then again the entire existence of the v2 link protocol is kind of a kludge. Once Tor 0.2.2 clients are all gone, we can drop this code entirely.) Found by starlight. Fix on 0.2.4.8-alpha. Fixes bug 12227.
2014-07-24Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2014-07-24update manpage for numentryguards / numdirectoryguardsRoger Dingledine
2014-07-24add a NumDirectoryGuards consensus param tooRoger Dingledine
2014-07-24Add and use a new NumEntryGuards consensus parameter.Roger Dingledine
When specified, it overrides our default of 3 entry guards. (By default, it overrides the number of directory guards too.) Implements ticket 12688.
2014-07-23Merge branch 'curve25519-donna32' into maint-0.2.4Nick Mathewson
2014-07-23Put the bug number and correct credits in the changes file for the new ↵Nick Mathewson
curve25519-donna32
2014-07-21fold in the changes entries so farRoger Dingledine
2014-07-21Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
2014-07-21Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4Nick Mathewson
2014-07-21Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-07-18Update geoip6 to the July 10 2014 database.Karsten Loesing
2014-07-18Update geoip to the July 10 2014 database.Karsten Loesing
2014-07-15Small tweaks to make curve25519-donna32 compile with our warningsNick Mathewson
2014-07-15Update to latest curve25519-donna32Nick Mathewson
2014-06-10Fix changes file for geoipNick Mathewson
2014-06-10Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4Nick Mathewson
2014-06-10Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-06-10Update geoip to the June 4 2014 database.Karsten Loesing
2014-06-10Update geoip6 to the June 4 2014 database.Karsten Loesing
2014-05-17Merge branch 'maint-0.2.4' into release-0.2.4Roger Dingledine
This is an "ours" merge, to avoid taking the commit that bumped maint-0.2.4's version to 0.2.4.22-dev.
2014-05-16Bump maint-0.2.4 version to 0.2.4.22-devNick Mathewson
(See discussion on #9553)
2014-05-16copy 0.2.4.22 notes into releasenotestor-0.2.4.22Nick Mathewson
2014-05-16Pick a release date for 0.2.4.22Nick Mathewson
2014-05-14match the changelog entries from 0.2.5.x when possibleRoger Dingledine
2014-05-14group the sectionsRoger Dingledine
2014-05-14two small fixes, and downgrade a severityRoger Dingledine
2014-05-14Bump release-0.2.4 version to 0.2.4.22Nick Mathewson
This is not officially released yet; it needs some QA first.
2014-05-14Reflow, slightly tidy ChangelogNick Mathewson
2014-05-14changelog edits for 0.2.4.22Nick Mathewson
2014-05-07mark backported changelog entries and ensure that they match the changelog.Nick Mathewson
2014-05-07Begin work on a changelog for 0.2.4.22 by copying in the changes files uneditedNick Mathewson
2014-05-07Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4Nick Mathewson
2014-05-07Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4Nick Mathewson
2014-05-07Merge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4Nick Mathewson
2014-05-07Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4Nick Mathewson
2014-05-07Merge remote-tracking branch 'public/update_ciphers_ff28' into maint-0.2.4Nick Mathewson
2014-05-01Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
Conflicts: src/or/microdesc.c
2014-05-01Downgrade bug 7164 warning to INFONick Mathewson
The 0.2.5.x warning is the one that might help us track this down; the warnings in stable are just annoying users over and over and over.
2014-04-30Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion