Merge branch 'asprintf'

diff --cc configure.in
Simple merge

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

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

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

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

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

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

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

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

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