Merge remote-tracking branch 'github/ticket26626'

diff --cc src/or/addressmap.c
Simple merge

diff --cc src/or/channel.c
Simple merge

diff --cc src/or/channelpadding.c
Simple merge

diff --cc src/or/channeltls.c
Simple merge

diff --cc src/or/circuitlist.c
Simple merge

diff --cc src/or/circuitstats.c
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/config.h
Simple merge

diff --cc src/or/confparse.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/connection_edge.c
Simple merge

diff --cc src/or/connection_or.c
Simple merge

diff --cc src/or/control.c
Simple merge

diff --cc src/or/dirauth/dirvote.c
Simple merge

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/hibernate.c
Simple merge

diff --cc src/or/main.c
Simple merge

diff --cc src/or/microdesc.c
Simple merge

diff --cc src/or/policies.c
Simple merge

diff --cc src/or/rephist.c
Simple merge

diff --cc src/or/router.c
Simple merge

diff --cc src/or/routerlist.c
Simple merge

diff --cc src/or/routerparse.c
Simple merge

diff --cc src/or/status.c
Simple merge

diff --cc src/or/torcert.c
Simple merge

diff --cc src/test/test_config.c
Simple merge

diff --cc src/test/test_crypto.c
Simple merge

diff --cc src/test/test_dir.c
Simple merge

diff --cc src/test/test_options.c
Simple merge

diff --cc src/test/test_status.c
Simple merge

diff --cc src/test/test_util.c
Simple merge