Merge branch 'maint-0.3.3'

diff --cc src/common/compat.c
Simple merge

diff --cc src/common/compat.h
Simple merge

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

diff --cc src/test/test_config.c
Simple merge