Merge branch 'maint-0.3.2'

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

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

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

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