commit 54559e5845f42c51600b80de6b67467627451fcb Merge: ea9472d 355f783 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 24 09:33:58 2016 -0400

Merge remote-tracking branch 'teor/bug18351'

changes/bug18351 | 6 ++++++ src/or/connection.c | 15 ++++++++++----- src/or/directory.c | 34 ++++++++++++++++++++++++---------- src/or/routerlist.c | 14 +++++++++----- 4 files changed, 49 insertions(+), 20 deletions(-)