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

[nickm at torproject.org]

commit fae8bcba9e344dd6ab5419a9019afd4947e329f0
Merge: 0e8e775 91f49bc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 15:52:02 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22460_case1         | 16 +++++++++++++
 changes/bug22460_case2         |  8 +++++++
 src/common/tortls.c            | 27 +++++++++++++++++++---
 src/common/tortls.h            |  1 +
 src/or/connection_or.c         | 51 ++++++++++++++++++++++++++++--------------
 src/or/connection_or.h         |  4 ++++
 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 | 39 +++++++++++++++++++++++++++++++-
 src/test/test_routerkeys.c     | 20 ++++++++---------
 src/test/test_shared_random.c  |  4 ++--
 14 files changed, 190 insertions(+), 47 deletions(-)