Merge remote-tracking branch 'arma/task19035-fixedup'

diff --cc configure.ac
Simple merge

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

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

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

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

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