Merge remote-tracking branch 'public/bug10849_025'

Conflicts:
	src/or/config.c

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

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

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

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

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

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