[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug18489'

[nickm at torproject.org]

commit ea9472d085b1344eb3abc3f9e644beff184cbce3
Merge: ea82978 b1569e3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 24 09:01:28 2016 -0400

    Merge remote-tracking branch 'teor/bug18489'

 changes/bug18489    | 6 ++++++
 src/or/routerlist.c | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)