[tor-commits] [tor/master] Merge branch 'bug5786'

[nickm at torproject.org]

commit 0b1a334842f632b935d0b23757722d06bd145724
Merge: c78a426 d9ba9f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 15:44:41 2012 -0400

    Merge branch 'bug5786'

 changes/bug5786_nocrash |    7 +++++++
 changes/bug5786_nodups  |    7 +++++++
 src/or/dirvote.c        |   10 +++++-----
 src/or/routerparse.c    |   17 +++++++++++++++++
 4 files changed, 36 insertions(+), 5 deletions(-)