[tor-commits] [tor/master] Merge branch 'bug22460_030_01' into maint-0.3.0

[nickm at torproject.org]

commit d5acdadaeffa8e1c61abef5881e9cc6e42d9a755
Merge: d1c1dc2 e5bdfd6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 15:44:36 2017 -0400

    Merge branch 'bug22460_030_01' into maint-0.3.0

 changes/bug22460_case1         | 16 ++++++++++++++++
 src/or/connection_or.c         | 12 +++++++++---
 src/or/main.c                  | 17 ++++++++++++-----
 src/or/or.h                    |  6 ++++++
 src/or/router.c                |  5 +++--
 src/or/routerkeys.c            | 37 +++++++++++++++++++++++++++++++------
 src/or/routerkeys.h            |  2 +-
 src/test/test_link_handshake.c |  7 +++++++
 src/test/test_routerkeys.c     | 20 ++++++++++----------
 src/test/test_shared_random.c  |  4 ++--
 10 files changed, 97 insertions(+), 29 deletions(-)