commit 87ea2b6655d43ab95becf681e26a2092db17161e Merge: 5b57f88 bc9a0f8 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 28 11:22:39 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug18812 | 4 ++++ src/or/connection_or.c | 51 +++++++++++++++++++++++++++++++++++++++++++++----- src/or/routerlist.c | 2 ++ 3 files changed, 52 insertions(+), 5 deletions(-)