torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
17,291 Commits 53 Branches 631 Tags
eccda448a7673ce83b63feb3e17b2aef103e6bfd
Commit Graph
17291 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Roger Dingledine eccda448a7 fold in changes entries 2014-07-28 03:44:35 -04:00
Roger Dingledine 637b4e62d1 Merge branch 'maint-0.2.4' into release-0.2.4 2014-07-28 03:09:12 -04:00
Roger Dingledine 68a2e4ca4b Warn and drop the circuit if we receive an inbound 'relay early' cell 
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-28 02:44:05 -04:00
Roger Dingledine 8882dcfc59 add a changes file for bug 12718 2014-07-27 15:41:30 -04:00
Arlo Breault 8f70d756fb Confusing log message when circuit can't be extended 2014-07-27 15:01:15 -04:00
Nick Mathewson d5558f0072 circuit_build_failed: distinguish "first hop chan failed", "CREATE failed" 
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-25 11:59:00 -04:00
Nick Mathewson e001610c99 Implement proposal 221: Stop sending CREATE_FAST 
This makes FastFirstHopPK an AUTOBOOL; makes the default "auto"; and
makes the behavior of "auto" be "look at the consensus."
 2014-07-25 11:59:00 -04:00
Nick Mathewson 1b551823de Avoid illegal read off end of an array in prune_v2_cipher_list 
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-24 19:45:38 -04:00
Roger Dingledine 911fb9399f Merge branch 'maint-0.2.4' into release-0.2.4 2014-07-24 16:22:36 -04:00
Roger Dingledine 71c62b15ca update manpage for numentryguards / numdirectoryguards 2014-07-24 16:19:48 -04:00
Roger Dingledine 9fc276a1c7 add a NumDirectoryGuards consensus param too 2014-07-24 16:19:47 -04:00
Roger Dingledine 56ee61b8ae Add and use a new NumEntryGuards consensus parameter. 
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-24 16:19:47 -04:00
Nick Mathewson 303d7f55d9 Merge branch 'curve25519-donna32' into maint-0.2.4 2014-07-23 21:28:18 -04:00
Nick Mathewson ad0cf550b7 Put the bug number and correct credits in the changes file for the new curve25519-donna32 2014-07-23 21:25:53 -04:00
Roger Dingledine dd4f5bc8a7 fold in the changes entries so far 2014-07-21 14:58:01 -04:00
Roger Dingledine 2998d384ec Merge branch 'maint-0.2.4' into release-0.2.4 2014-07-21 14:39:48 -04:00
Nick Mathewson 75501dbe4a Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4 2014-07-21 14:29:43 -04:00
Nick Mathewson 015f710f72 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2014-07-21 14:29:30 -04:00
Karsten Loesing 6345dfa1fe Update geoip6 to the July 10 2014 database. 2014-07-18 16:31:25 +02:00
Karsten Loesing 6d5efbef22 Update geoip to the July 10 2014 database. 2014-07-18 16:28:50 +02:00
Nick Mathewson 391861311c Small tweaks to make curve25519-donna32 compile with our warnings 2014-07-15 15:43:40 +02:00
Nick Mathewson 8cc0860592 Update to latest curve25519-donna32 2014-07-15 15:42:20 +02:00
Nick Mathewson f5ce580bab Fix changes file for geoip 2014-06-10 21:08:44 -04:00
Nick Mathewson 3bc28c4c04 Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4 2014-06-10 21:08:12 -04:00
Nick Mathewson ab774a8500 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2014-06-10 21:07:57 -04:00
Karsten Loesing 555c43cd03 Update geoip to the June 4 2014 database. 2014-06-10 21:33:52 +02:00
Karsten Loesing 40579cb6a5 Update geoip6 to the June 4 2014 database. 2014-06-10 21:32:24 +02:00
Roger Dingledine 9959bc54e1 Merge branch 'maint-0.2.4' into release-0.2.4 
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-17 04:36:17 -04:00
Nick Mathewson 8d9602c21c Bump maint-0.2.4 version to 0.2.4.22-dev 
(See discussion on #9553)
 2014-05-16 09:16:54 -04:00
Nick Mathewson 2ee56e4c2c copy 0.2.4.22 notes into releasenotes tor-0.2.4.22 2014-05-16 09:05:06 -04:00
Nick Mathewson 1e7416771e Pick a release date for 0.2.4.22 2014-05-16 08:56:35 -04:00
Roger Dingledine a7d700aa04 match the changelog entries from 0.2.5.x when possible 2014-05-14 16:04:16 -04:00
Roger Dingledine 9aba2117e2 group the sections 2014-05-14 15:55:52 -04:00
Roger Dingledine ca085ba341 two small fixes, and downgrade a severity 2014-05-14 15:48:57 -04:00
Nick Mathewson 0fed6ad45b Bump release-0.2.4 version to 0.2.4.22 
This is not officially released yet; it needs some QA first.
 2014-05-14 11:14:25 -04:00
Nick Mathewson 1b37d8bef0 Reflow, slightly tidy Changelog 2014-05-14 10:02:55 -04:00
Nick Mathewson 6932f87ae1 changelog edits for 0.2.4.22 2014-05-14 09:41:58 -04:00
Nick Mathewson 3dfd8dd97b mark backported changelog entries and ensure that they match the changelog. 2014-05-07 23:42:04 -04:00
Nick Mathewson 20d569882f Begin work on a changelog for 0.2.4.22 by copying in the changes files unedited 2014-05-07 23:35:00 -04:00
Nick Mathewson 183c861e9a Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4 2014-05-07 23:20:58 -04:00
Nick Mathewson 411c622906 Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4 2014-05-07 23:11:32 -04:00
Nick Mathewson 0ad8133a7e Merge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4 2014-05-07 23:04:59 -04:00
Nick Mathewson 882893c8c3 Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4 2014-05-07 23:04:48 -04:00
Nick Mathewson 894c8b2266 Merge remote-tracking branch 'public/update_ciphers_ff28' into maint-0.2.4 2014-05-07 23:04:22 -04:00
Nick Mathewson 14bc6e8993 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 
Conflicts:
	src/or/microdesc.c
 2014-05-01 11:44:25 -04:00
Nick Mathewson 6a4f5d9b4d Downgrade bug 7164 warning to INFO 
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-05-01 11:42:02 -04:00
Nick Mathewson efab3484e6 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2014-04-30 20:25:15 -04:00
Nick Mathewson 8828794dc2 Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3 2014-04-30 20:23:22 -04:00
Nick Mathewson 35699ef9f5 Drop the MaxMemInCellQueues lower limit down to 256 MB. 
on #9686, gmorehose reports that the 500 MB lower limit is too high
for raspberry pi users.

This is a backport of 647248729f to 0.2.4.

Note that in 0.2.4, the option is called MaxMemInCellQueues.
 2014-04-29 20:48:22 -04:00
Nick Mathewson 1d3ffc0ec9 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2014-04-29 13:02:18 -04:00