[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug6404' into maint-0.2.3

[nickm at torproject.org]

commit 991a8acba2e2148a576465c3e07e9f6ce4864ea1
Merge: 88859b2 a4fbfa8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 10:35:40 2012 -0400

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

 changes/bug6404      |   16 ++++++++++++++++
 src/or/dirvote.c     |   48 ++++++++++++++++++++++++++++++------------------
 src/or/microdesc.c   |    7 +------
 src/or/routerparse.c |    5 +++++
 4 files changed, 52 insertions(+), 24 deletions(-)