Merge commit 'sebastian/bug2317' into maint-0.2.2

changes/bug2317

doc/spec/dir-spec.txt

doc/spec/path-spec.txt

src/or/circuitbuild.c

src/or/circuitbuild.h

src/or/circuitlist.c

src/or/connection_or.c

src/or/dirvote.h

src/or/networkstatus.c

src/or/networkstatus.h

src/or/or.h

src/or/relay.c

src/or/router.c

src/or/routerlist.c

src/or/routerparse.c

src/test/test_dir.c