Merge remote-tracking branch 'public/prop171_v2'

changes/prop171

doc/tor.1.txt

src/common/util.c

src/common/util.h

src/or/circuitlist.c

src/or/circuituse.c

src/or/config.c

src/or/config.h

src/or/connection.c

src/or/connection.h

src/or/connection_edge.c

src/or/connection_edge.h

src/or/directory.c

src/or/dnsserv.c

src/or/main.c

src/or/main.h

src/or/or.h

src/or/router.c