Merge remote-tracking branch 'origin/maint-0.2.3'

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

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

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

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

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