commit 88179bd9b644032f84aed51a7a682e11e5067c11 Merge: 53676e7 4231729 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 8 20:43:21 2014 -0400

Merge remote-tracking branch 'public/update_ciphers_ff28'

changes/ff28_ciphers | 6 ++ src/common/ciphers.inc | 169 ++++++++++++------------------------- src/common/get_mozilla_ciphers.py | 30 +++++-- 3 files changed, 84 insertions(+), 121 deletions(-)