[tor-commits] [tor/master] Merge branch 'bug9200' into maint-0.2.4

[nickm at torproject.org]

commit 7a4145c45aa0833af96cdb4b5c3fba90731c7037
Merge: c78c8de b34279d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 8 11:35:25 2013 -0400

    Merge branch 'bug9200' into maint-0.2.4

 changes/bug9200  |    5 +++++
 src/or/dirvote.c |   14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)