commit a8fcb6aa1a9f60d8335c2c9d775a61e61b2cc278 Merge: 37dabc0 9a0fd2d Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 27 11:04:44 2017 -0400

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

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