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

[nickm at torproject.org]

commit 894c8b22662131817e5d7383740b2b285f9b7491
Merge: 14bc6e8 4231729
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 7 23:04:22 2014 -0400

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

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