[or-cvs] [tor/master] Merge commit 'sebastian/bug2317' into maint-0.2.2

[arma@xxxxxxxxxxxxxx]

commit 7699014e1e9e183d1fd840e59909bcf77ba3321b
Merge: bebd95e a1860cc
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Sat Jan 15 21:54:49 2011 -0500

    Merge commit 'sebastian/bug2317' into maint-0.2.2

 changes/bug2317        |    9 +++++
 doc/spec/dir-spec.txt  |    8 +++-
 doc/spec/path-spec.txt |   28 ++++++++++++++--
 src/or/circuitbuild.c  |   84 ++++++++++++++++++++++++++++++++++-------------
 src/or/circuitbuild.h  |    2 +
 src/or/circuitlist.c   |    4 ++-
 src/or/connection_or.c |    8 ++--
 src/or/dirvote.h       |    3 --
 src/or/networkstatus.c |   54 ++++++++++++++++++++++++------
 src/or/networkstatus.h |    5 +--
 src/or/or.h            |   27 +++++++++++++++-
 src/or/relay.c         |    6 ++--
 src/or/router.c        |    2 +-
 src/or/routerlist.c    |    3 +-
 src/or/routerparse.c   |    3 +-
 src/test/test_dir.c    |    7 +++-
 16 files changed, 193 insertions(+), 60 deletions(-)