[tor-commits] [tor/release-0.2.5] Merge branch 'bug22737_024' into maint-0.2.4

[nickm at torproject.org]

commit d56f6993990ab75b6ab8a80027ee60e610489a2c
Merge: 104e8fa 8d2978b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 27 11:04:41 2017 -0400

    Merge branch 'bug22737_024' into maint-0.2.4

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