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
Andrea Shepard
5d81fd25a0
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-25 21:42:12 -07:00
Andrea Shepard
b8b46e8ef8
Add some mocks needed to unit test ClientTransportPlugin/ServerTransportPlugin config line parsing
2014-07-25 21:41:03 -07:00
Andrea Shepard
18c97ad8bc
Expose parse_client_transport_line() and parse_server_transport_line() for the test suite
2014-07-25 17:49:47 -07:00
Roger Dingledine
3f39c0e63e
Merge branch 'maint-0.2.5'
2014-07-25 12:22:41 -04:00
Roger Dingledine
2126feaabc
get rid of already-merged prop221 changes file
2014-07-25 12:22:05 -04:00
Roger Dingledine
b350ac0860
Merge branch 'maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/or.h
2014-07-25 12:15:47 -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
Roger Dingledine
bdc2cefd4e
Merge branch 'maint-0.2.5'
2014-07-24 19:49:29 -04:00
Roger Dingledine
472696e8e5
get rid of already-merged bug12227 changes file
2014-07-24 19:49:01 -04:00
Roger Dingledine
1ed77ff724
Merge branch 'maint-0.2.4' into maint-0.2.5
2014-07-24 19:48:37 -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
a3d8ffe010
fix typo that crept in to 0.2.4.4-alpha
2014-07-24 17:07:39 -04:00
Roger Dingledine
eb3e0e3da3
Merge branch 'maint-0.2.5'
2014-07-24 16:30:50 -04:00
Roger Dingledine
a57c07b210
Raise guard threshold to top 25% or 2000 kilounits
...
Authorities now assign the Guard flag to the fastest 25% of the
network (it used to be the fastest 50%). Also raise the consensus
weight that guarantees the Guard flag from 250 to 2000. For the
current network, this results in about 1100 guards, down from 2500.
This step paves the way for moving the number of entry guards
down to 1 (proposal 236) while still providing reasonable expected
performance for most users.
Implements ticket 12690.
2014-07-24 16:24:17 -04:00
Roger Dingledine
bc9866e13f
Merge branch 'maint-0.2.5'
2014-07-24 16:23:26 -04:00
Roger Dingledine
a4c641cce9
Merge branch 'maint-0.2.4' into maint-0.2.5
2014-07-24 16:23:08 -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
dfe80c966d
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-07-23 21:28:58 -04:00
Nick Mathewson
5c200d9be2
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-07-23 21:28:42 -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
Nick Mathewson
641c1584f7
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-07-21 14:30:27 -04:00
Nick Mathewson
e0aa88d106
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-07-21 14:30:09 -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
Nick Mathewson
e7e92fb2f9
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-07-21 14:01:00 -04:00
Nick Mathewson
fa8bb25f64
update changes entry with info for 11578 patch
2014-07-21 14:00:10 -04:00
Sathyanarayanan Gunasekaran
3af2a5d00e
Fix warning on building with bufferevents
...
Fixes #11578
2014-07-21 13:58:14 -04:00
Nick Mathewson
486bd4fae7
Use safe_str in channel_dumpstats: improve 12184 diagnostic
2014-07-18 21:20:44 +02: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
a36cd51b59
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-07-17 11:34:33 +02:00
Nick Mathewson
f6a776d915
Merge remote-tracking branch 'public/bug12602_024' into maint-0.2.5
2014-07-17 11:32:16 +02:00
Nick Mathewson
66798dfdc0
Fix compilation with no-compression OpenSSL builds and forks
...
Found because LibreSSL has OPENSSL_NO_COMP always-on, but this
conflicts with the way that _we_ turn off compression. Patch from
dhill, who attributes it to "OpenBSD". Fixes bug 12602; bugfix on
0.2.1.1-alpha, which introduced this turn-compression-off code.
2014-07-17 11:25:56 +02:00
Nick Mathewson
7259e3f604
Move test_descriptors.txt to an include file
...
Making the text file work out-of-tree didn't work on windows.
Maybe we can get it working that way later.
2014-07-16 22:37:00 +02:00
Nick Mathewson
facecce176
Fix tests when building out-of-tree
...
(This was too hard. Silly autoconf.)
2014-07-16 21:07:22 +02:00
Nick Mathewson
b408125288
Merge remote-tracking branch 'andrea/bug11302'
2014-07-16 16:58:41 +02:00
Nick Mathewson
0ef5d4d633
Add a changes file for bug12202
2014-07-16 16:54:42 +02:00
Nick Mathewson
5690284559
Fix wide lines, make entry_is_live() non-inline
2014-07-16 16:52:16 +02:00
Nick Mathewson
368ff2291b
Merge remote-tracking branch 'asn/bug12202'
2014-07-16 16:49:07 +02:00
Nick Mathewson
f74a932e0b
Merge remote-tracking branch 'sysrqb/bug12573'
2014-07-16 15:38:10 +02:00
Nick Mathewson
e669e910f4
changes file for 12207
2014-07-16 15:33:47 +02:00
Nick Mathewson
d8705ec720
Merge remote-tracking branch 'asn/bug12207_second_draft'
2014-07-16 15:33:00 +02:00
Nick Mathewson
8c7fbdf3af
fix a c99-ism
2014-07-16 15:30:14 +02:00
Nick Mathewson
c793a6edb4
Clarify TruncateLogFile manpage entry
2014-07-16 14:01:38 +02:00
