[tor-commits] [tor/maint-0.2.7-redux] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

[nickm at torproject.org]

commit 9a0fd2dbb187e898f63064c483776538a90562f1
Merge: 24ee859 3de2761
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 27 11:04:44 2017 -0400

    Merge branch 'maint-0.2.6' into maint-0.2.7-redux

 changes/bug22737       | 12 ++++++++++++
 src/or/connection_or.c |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)