commit 3483f7c00349be6cba7b703f2e5ee94563d0c6eb Merge: 307be8d 9a0fd2d Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 27 11:04:44 2017 -0400

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

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