Merge branch 'bug25843_v2_squashed'

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

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

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

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