Merge branch 'bug26367_035_01'

diff --cc configure.ac
Simple merge

diff --cc doc/tor.1.txt
Simple merge

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

diff --cc src/app/config/or_options_st.h
Simple merge

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

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

diff --cc src/feature/dircache/directory.c
Simple merge

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