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

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