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

[nickm at torproject.org]

commit 1fd9d5ef37943a3c4688b113972bb7f6d44dbb7f
Merge: eb4ca1c 3de2761
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 27 11:04:44 2017 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

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