Merge branch 'bug3045' into maint-0.2.2

changes/bug3045

src/or/circuitbuild.c

src/or/circuitlist.c

src/or/circuituse.c

src/or/command.c

src/or/connection_edge.c

src/or/directory.c

src/or/dirserv.c

src/or/relay.c

src/or/rendclient.c

src/or/rendservice.c

src/or/rephist.c

src/or/router.c

src/or/router.h

src/or/routerlist.c

src/or/routerparse.c