[tor-commits] [tor/release-0.2.3] Merge remote-tracking branch 'public/bug6514' into maint-0.2.3

[arma at torproject.org]

commit f25e8d034b78be01c9fbe659d4686fc370083572
Merge: 91b52a2 2d6d5db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 11:53:06 2012 -0400

    Merge remote-tracking branch 'public/bug6514' into maint-0.2.3

 changes/bug6514  |    5 +++++
 src/or/dirvote.c |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)