Merge branch 'bug1345' into maint-0.2.2

changes/bug1345

src/common/container.c

src/common/container.h

src/or/circuituse.c

src/or/circuituse.h

src/or/config.c

src/or/connection_edge.c

src/or/connection_edge.h

src/or/main.c

src/or/or.h