commit b91dce9454c3db669a07968b25a4fa03d8526917 Merge: 0de3147bf 6069c829f Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 25 11:39:38 2017 -0400

Merge branch '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(-)