Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
commit7e486dd6f7f845c14471b406d6bc7dfa4f593b12
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 21:51:54 +0000 (11 16:51 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 21:51:54 +0000 (11 16:51 -0500)
tree54f7252b65adc3c5010f96885885c1e5bc94c650
parent953a8f851081e6157e9296186c296ab10106b7eb
parent0dc55fb24756c5ae80e71f6fce93d97d73efd2fc
Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
src/or/routerlist.c