Merge branch 'bug14013_029_01_squashed'

src/common/util_format.c

src/or/circuituse.c

src/or/config.c

src/or/control.c

src/or/directory.c

src/or/dirserv.c

src/or/entrynodes.c

src/or/networkstatus.c

src/or/rephist.c

src/or/routerlist.c

src/or/routerparse.c

src/test/test_crypto.c

src/test/test_dir.c

src/test/test_guardfraction.c

src/test/test_microdesc.c

src/test/test_ntor_cl.c

src/test/test_util_format.c