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

[nickm at torproject.org]

commit 273f536d7217df4faf38f937af9395748a5f513a
Merge: 043329e 886d4be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 28 08:54:50 2014 -0500

    Merge branch 'bug10884_squashed'

 changes/bug10884           |    5 +++
 doc/tor.1.txt              |    4 ++
 src/common/crypto.c        |   22 ++++++++++
 src/common/crypto.h        |    1 +
 src/or/main.c              |    2 +
 src/or/router.c            |   95 +++++++++++++++++++++++++++++---------------
 src/or/router.h            |    1 +
 src/test/include.am        |    1 +
 src/test/test.c            |    2 +
 src/test/test_crypto.c     |   51 ++++++++++++++++++++++++
 src/test/test_routerkeys.c |   84 +++++++++++++++++++++++++++++++++++++++
 11 files changed, 235 insertions(+), 33 deletions(-)