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

commit 939d01f0ba76268642baeef50fcf30be086de62e Merge: d517233 991a8ac Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 21 10:36:51 2012 -0400

Merge remote-tracking branch 'origin/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(-)