commit f0488551e7be4e2d21a104903a86be993a240398 Merge: 48d7dfb 64bf6b7 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 26 19:31:15 2016 -0400 Merge branch 'bug19639_squashed' changes/bug19639 | 3 +++ src/or/router.c | 8 +++++--- src/or/routerlist.c | 2 +- src/or/routerlist.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-)