[tor-commits] [tor/master] Merge branch 'ahf_bugs_17847_2_squashed'

[nickm at torproject.org]

commit fa00f2dce5a93164e36860794b75c595067c2f63
Merge: b6dce6c 46ef32b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 18 11:04:58 2017 -0500

    Merge branch 'ahf_bugs_17847_2_squashed'

 src/or/routerlist.c | 91 ++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 47 deletions(-)