commit 183c861e9a235fd9de565721329b38cde65bfbd4 Merge: 75e10f5 411c622 Author: Nick Mathewson nickm@torproject.org Date: Wed May 7 23:20:58 2014 -0400

Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4

changes/bug10849_023 | 6 ++ changes/bug11513 | 12 +++ changes/bug11553 | 5 ++ changes/bug7164_downgrade | 6 ++ changes/bug9686_024 | 5 ++ changes/ff28_ciphers | 6 ++ changes/md_leak_bug | 5 ++ changes/ticket11528 | 6 ++ src/common/ciphers.inc | 169 ++++++++++++------------------------- src/common/gen_server_ciphers.py | 115 +++++++++++++++++++++++++ src/common/get_mozilla_ciphers.py | 30 +++++-- src/common/tortls.c | 44 +++++++--- src/or/channel.h | 2 + src/or/circuitbuild.c | 9 +- src/or/config.c | 10 ++- src/or/microdesc.c | 2 +- src/or/routerparse.c | 2 + 17 files changed, 296 insertions(+), 138 deletions(-)