[tor-commits] [tor/master] Merge branch 'feature15652_squashed'

[nickm at torproject.org]

commit 3acee6142221839137607c9a9cbf8ca4feea5993
Merge: 8a951ed 55118d9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 23 09:09:33 2015 -0400

    Merge branch 'feature15652_squashed'

 changes/feature15652       |    9 ++
 src/common/crypto.c        |  220 ++++++++++++++++++++++++++++++--------------
 src/common/crypto.h        |    5 +-
 src/common/crypto_format.c |    2 +-
 src/or/connection.c        |   19 +---
 src/or/dirvote.c           |    5 +-
 src/or/rendclient.c        |    7 +-
 src/or/rendcommon.c        |    3 +-
 src/or/rendservice.c       |   10 +-
 src/or/router.c            |    2 +-
 src/or/routerparse.c       |    3 +-
 src/test/test_crypto.c     |   36 +++++++-
 src/tools/tor-gencert.c    |    6 +-
 13 files changed, 221 insertions(+), 106 deletions(-)