commit f49876d66efbc5679ba7d9d9c6538c763b8e06b5 Merge: 08ce39fb0 6ab07419c Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 30 12:06:21 2017 -0500

Merge branch 'trove-2017-012_025' into maint-0.2.5

changes/trove-2017-012-part1 | 6 ++++++ src/or/routerlist.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-)