[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'arma/bug19969_028_squashed' into maint-0.2.8

[nickm at torproject.org]

commit 7a45ef5a4706aab57abcf170c10080811223175e
Merge: 9b18b21 b2f82d4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 3 15:44:30 2016 -0400

    Merge remote-tracking branch 'arma/bug19969_028_squashed' into maint-0.2.8

 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(-)