911fb9399f
Merge branch 'maint-0.2.4' into release-0.2.4
2014-07-24 16:22:36 -04:00
71c62b15ca
update manpage for numentryguards / numdirectoryguards
2014-07-24 16:19:48 -04:00
9fc276a1c7
add a NumDirectoryGuards consensus param too
2014-07-24 16:19:47 -04:00
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
303d7f55d9
Merge branch 'curve25519-donna32' into maint-0.2.4
2014-07-23 21:28:18 -04:00
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
dd4f5bc8a7
fold in the changes entries so far
2014-07-21 14:58:01 -04:00
2998d384ec
Merge branch 'maint-0.2.4' into release-0.2.4
2014-07-21 14:39:48 -04:00
75501dbe4a
Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4
2014-07-21 14:29:43 -04:00
015f710f72
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-07-21 14:29:30 -04:00
6345dfa1fe
Update geoip6 to the July 10 2014 database.
2014-07-18 16:31:25 +02:00
6d5efbef22
Update geoip to the July 10 2014 database.
2014-07-18 16:28:50 +02:00
391861311c
Small tweaks to make curve25519-donna32 compile with our warnings
2014-07-15 15:43:40 +02:00
8cc0860592
Update to latest curve25519-donna32
2014-07-15 15:42:20 +02:00
f5ce580bab
Fix changes file for geoip
2014-06-10 21:08:44 -04:00
3bc28c4c04
Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4
2014-06-10 21:08:12 -04:00
ab774a8500
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-06-10 21:07:57 -04:00
555c43cd03
Update geoip to the June 4 2014 database.
2014-06-10 21:33:52 +02:00
40579cb6a5
Update geoip6 to the June 4 2014 database.
2014-06-10 21:32:24 +02:00
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
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
2ee56e4c2c
copy 0.2.4.22 notes into releasenotes
2014-05-16 09:05:06 -04:00
1e7416771e
Pick a release date for 0.2.4.22
2014-05-16 08:56:35 -04:00
a7d700aa04
match the changelog entries from 0.2.5.x when possible
2014-05-14 16:04:16 -04:00
9aba2117e2
group the sections
2014-05-14 15:55:52 -04:00
ca085ba341
two small fixes, and downgrade a severity
2014-05-14 15:48:57 -04:00
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
1b37d8bef0
Reflow, slightly tidy Changelog
2014-05-14 10:02:55 -04:00
6932f87ae1
changelog edits for 0.2.4.22
2014-05-14 09:41:58 -04:00
3dfd8dd97b
mark backported changelog entries and ensure that they match the changelog.
2014-05-07 23:42:04 -04:00
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
183c861e9a
Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4
2014-05-07 23:20:58 -04:00
411c622906
Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4
2014-05-07 23:11:32 -04:00
0ad8133a7e
Merge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4
2014-05-07 23:04:59 -04:00
882893c8c3
Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4
2014-05-07 23:04:48 -04:00
894c8b2266
Merge remote-tracking branch 'public/update_ciphers_ff28' into maint-0.2.4
2014-05-07 23:04:22 -04:00
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
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
efab3484e6
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-04-30 20:25:15 -04:00
8828794dc2
Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3
2014-04-30 20:23:22 -04:00
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
2014-04-29 20:48:22 -04:00
1d3ffc0ec9
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-04-29 13:02:18 -04:00
65575b0755
Stop leaking memory in error cases of md parsing
...
When clearing a list of tokens, it's important to do token_clear()
on them first, or else any keys they contain will leak. This didn't
leak memory on any of the successful microdescriptor parsing paths,
but it does leak on some failing paths when the failure happens
during tokenization.
Fixes bug 11618; bugfix on 0.2.2.6-alpha.
2014-04-29 13:00:00 -04:00
f8248abbd6
Forbid TunneledDirConns 0 and PreferTunneledDirConns 0 if being a HS
...
Fixes bug 10849; bugfix on 0.2.1.1-alpha (I believe)
2014-04-25 14:24:41 -04:00
75e10f58a9
Add a missing changelog entry back from 0.2.4.11-alpha
...
When I merged the fix for #7351 , and implemented proposal 214 (4-byte
circuit IDs), I forgot to add a changes file. Later, we never noticed
that it didn't have one.
Resolves ticket #11555 . Thanks to cypherpunks for noticing this was
missing.
2014-04-24 14:00:36 -04:00
4e0bd24287
Merge branch 'maint-0.2.4' into release-0.2.4
2014-04-23 13:47:07 -04:00
9e44df2c98
Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4
2014-04-23 11:01:39 -04:00
bb9b4c37f8
Supply better and less frequent warnings on circID exhaustion
...
Fixes the surface behavior of #11553
2014-04-18 12:31:06 -04:00
0b319de60f
Elevate server TLS cipher preferences over client
...
The server cipher list is (thanks to #11513 ) chosen systematically to
put the best choices for Tor first. The client cipher list is chosen
to resemble a browser. So let's set SSL_OP_CIPHER_SERVER_PREFERENCE
to have the servers pick according to their own preference order.
2014-04-17 10:33:04 -04:00
3fc0f9efb8
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-04-16 14:57:14 -04:00
Roger Dingledine
Nick Mathewson
Karsten Loesing