Merge branch 'bug9286_v3_squashed'

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

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

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

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

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

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

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