commit beeeeb0afa7ba6f1af0e64afbed13376855ea88d Merge: ca19b2115 1deda2106 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:56:31 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)