Merge commit 'sebastian/bug1831'

changes/bug1831

contrib/checkSpace.pl

src/or/circuitbuild.c

src/or/circuitbuild.h

src/or/config.c

src/or/connection.c

src/or/connection_edge.c

src/or/control.c

src/or/cpuworker.c

src/or/dirvote.c

src/or/geoip.c

src/or/policies.c

src/or/relay.c

src/or/rendclient.c

src/test/test.c

src/test/test_dir.c