[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug19648'

[nickm at torproject.org]

commit 86eb63deb45f2d21375bee74ef4758c24974a97e
Merge: 720552b 994595a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 6 09:32:22 2017 -0400

    Merge remote-tracking branch 'public/bug19648'

 changes/bug19648    | 5 +++++
 src/or/routerlist.c | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)