[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4

[nickm at torproject.org]

commit 882893c8c3657be66b48580aa972e71dac25da5e
Merge: 894c8b2 bd3db82
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 7 23:04:48 2014 -0400

    Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4

 changes/bug11513                 |   12 ++++
 src/common/gen_server_ciphers.py |  115 ++++++++++++++++++++++++++++++++++++++
 src/common/tortls.c              |   40 +++++++++----
 3 files changed, 155 insertions(+), 12 deletions(-)