commit cb54cd6745eaf15716aa357fc253f43f26c051a6 Merge: 49dca8b 7984fc1 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 7 10:06:50 2015 -0500 Merge branch 'bug9286_v3_squashed' changes/bug9286 | 4 ++++ src/common/util.c | 23 ++++++++++++++++++----- src/common/util.h | 1 + src/or/rendcommon.c | 6 +++--- src/or/routerparse.c | 10 ++++++++-- src/or/routerparse.h | 3 ++- src/test/test.c | 12 ++++++------ src/test/test_util.c | 16 +++++++++------- 8 files changed, 51 insertions(+), 24 deletions(-)