Merge remote-tracking branch 'origin/maint-0.2.5'

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

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

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