[tor-commits] [tor/master] Merge commit 'sebastian/bug2663' into maint-0.2.2

[nickm at torproject.org]

commit 600ad7bf8d499d04259586bcf91afed7dfb88f99
Merge: 879f171 2f8e96b
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Mar 11 20:37:21 2011 -0500

    Merge commit 'sebastian/bug2663' into maint-0.2.2

 src/or/dirvote.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)