[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug15745_027_03'

[nickm at torproject.org]

commit 647b7d37c2b3de4a837d0a4bf810c0132624c15d
Merge: 3acee61 e48ad35
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 23 09:10:35 2015 -0400

    Merge remote-tracking branch 'public/bug15745_027_03'

 changes/bug15745       |    7 +++++++
 src/common/crypto.c    |   21 ++++++++++++++++++++-
 src/common/crypto.h    |    1 +
 src/common/tortls.c    |    3 ++-
 src/or/entrynodes.c    |    6 ++++--
 src/or/main.c          |    2 +-
 src/or/or.h            |   19 +++++++++++++------
 src/or/rendservice.c   |   21 ++++++++++++---------
 src/or/router.c        |    4 +++-
 src/test/test_crypto.c |   25 +++++++++++++++++++++++++
 10 files changed, 88 insertions(+), 21 deletions(-)