commit 017245074e3a2c1c7ad4375911a586367e036b04 Merge: 34879d0 744077d Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 1 09:54:01 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug18849 | 4 ++++ src/or/routerlist.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-)