commit 2728a12232cf3e93986493488a4042e02f704f30 Merge: 399eebe ada5668 Author: Nick Mathewson nickm@torproject.org Date: Sat Jun 11 10:16:36 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug19203 | 4 ++++ src/or/nodelist.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)