[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug20630'

[nickm at torproject.org]

commit a742637f5ae033a1f05490cbf1d4444cd0529d32
Merge: 427dcb2 307d244
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 17 20:09:44 2016 -0500

    Merge remote-tracking branch 'public/bug20630'

 src/or/connection_edge.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)