[or-cvs] [tor/master] Merge branch 'bug2203_rebased' into maint-0.2.2

[nickm at torproject.org]

commit e9803aa71003079cc00a8b3c80324581758a36be
Merge: f9e251c 5774ada
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 4 12:22:18 2011 -0500

    Merge branch 'bug2203_rebased' into maint-0.2.2

 changes/bug2203       |    6 ++++++
 doc/spec/dir-spec.txt |    5 +++++
 src/or/dirvote.c      |   11 +++++++++--
 src/or/routerlist.c   |    4 ++--
 4 files changed, 22 insertions(+), 4 deletions(-)