[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit fab99844fc324b2c9d415b1b1c192a25cf1c4230
Merge: dd90ab4 7a4145c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 8 11:35:48 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'

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