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

commit 2704441e7ff1242d168bc14dda946fc41844f2c5 Merge: 9556668 bd3db82 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 15 14:54:25 2014 -0400

Merge remote-tracking branch 'public/bug11513_024'

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