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

[nickm at torproject.org]

commit e86c3b283a20e496e387f5d0fffbd408eee0e0d9
Merge: 574344b 2025490
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 6 12:44:13 2015 -0400

    Merge remote-tracking branch 'public/bug16286'

 changes/bug16286  |    8 ++++++++
 src/or/dirserv.c  |   37 +++++++++++++++++++------------------
 src/or/dirserv.h  |    3 ++-
 src/or/nodelist.c |    2 +-
 4 files changed, 30 insertions(+), 20 deletions(-)