commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a Merge: 3913f95 ccae991 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 27 11:04:44 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.6

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