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

commit e6d77520ef99c2f0d576f0314d3f86322e16b3af Merge: c1195d4 ccae991 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug22737 | 12 ++++++++++++ src/or/connection_or.c | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-)