[tor-commits] [tor/master] Merge branch 'bug19418_029' into maint-0.3.1

[nickm at torproject.org]

commit 6069c829f90576c04a0802d2a108378a2bbabb7a
Merge: 10b242822 418f3d629
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 25 11:38:24 2017 -0400

    Merge branch 'bug19418_029' into maint-0.3.1

 changes/bug19418       |  7 +++++++
 src/common/tortls.c    | 21 ++++++++++++++-------
 src/or/connection_or.c |  4 +++-
 src/or/hibernate.c     |  5 ++++-
 src/or/rendclient.c    |  5 +++++
 src/or/rendcommon.c    |  5 ++++-
 src/or/rendservice.c   |  9 ++++++++-
 src/or/router.c        | 14 +++++++++++---
 src/or/routerkeys.c    |  4 +++-
 src/or/routerparse.c   |  5 ++++-
 10 files changed, 63 insertions(+), 16 deletions(-)