Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2

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

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

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

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