commit aa1fc73e3328e64e02c8bc881d6ffb6590191eea Merge: 5a3d963 df6bd47 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 13 12:09:13 2012 -0400

Merge branch 'bug4744_squashed'

changes/bug4744 | 4 + changes/prop198 | 12 +++ src/common/ciphers.inc | 47 ++++++++- src/common/get_mozilla_ciphers.py | 192 +++++++++++++++++++++++++++++++++++++ src/common/tortls.c | 72 ++++++++++++-- 5 files changed, 313 insertions(+), 14 deletions(-)