[tor-commits] [tor/master] Merge branches 'server_ciphers' and 'ciphers.inc'

[nickm at torproject.org]

commit 67eb6470d711b36d1b855e6423ce7bbb302af834
Merge: 3bfe5da 26a9787 4f1dc34
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 27 16:45:18 2017 -0500

    Merge branches 'server_ciphers' and 'ciphers.inc'

 changes/ciphers.inc                    |  5 +++
 changes/server_cipher                  |  3 ++
 scripts/codegen/gen_server_ciphers.py  | 62 ++++++++++++++++----------
 scripts/codegen/get_mozilla_ciphers.py | 13 +++---
 src/common/ciphers.inc                 | 80 +++++++++-------------------------
 src/common/tortls.c                    | 16 ++++++-
 6 files changed, 89 insertions(+), 90 deletions(-)