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

[nickm at torproject.org]

commit fdb7fc70d03d21d967db4928960241a624483a24
Merge: 72ba173 051dd9c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 26 09:44:16 2014 -0400

    Merge remote-tracking branch 'public/bug10163'

 changes/prop215      |   16 +++
 src/or/dirvote.c     |  385 +++++---------------------------------------------
 src/or/dirvote.h     |   22 +--
 src/or/routerparse.c |    9 +-
 src/test/test_dir.c  |   16 ---
 5 files changed, 56 insertions(+), 392 deletions(-)