Merge branch 'maint-0.3.4'

diff --cc configure.ac
Simple merge

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

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

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

diff --cc src/test/include.am
Simple merge