[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit 272572c3a2203a8a62f4c8c081fea55183f1f426
Merge: 0abaedb 3cd520a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 3 15:45:16 2016 -0400

    Merge branch 'maint-0.2.9'

 changes/bug19969         | 10 ++++++++++
 src/or/connection_edge.c |  9 +++++++++
 src/or/main.c            | 31 +++++++++++++++++++++++--------
 src/or/main.h            |  2 ++
 4 files changed, 44 insertions(+), 8 deletions(-)