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

[nickm at torproject.org]

commit b677ccd3aba80f4b66f16e6e1c0e3c68b49106c5
Merge: d8517fe 90db394
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 23 08:55:31 2015 -0500

    Merge remote-tracking branch 'public/ticket13762'

 changes/ticket13762 |    5 +++++
 src/or/routerlist.c |   10 ++++++----
 src/or/routerlist.h |    2 +-
 src/test/test_dir.c |    3 ++-
 4 files changed, 14 insertions(+), 6 deletions(-)