commit ccae991662adb3b64bdb1dcd4a942e4d1e163414 Merge: 325c507 d56f699 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 27 11:04:44 2017 -0400

Merge branch 'maint-0.2.4' into maint-0.2.5

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