commit 593909ea70db9c00d3ae6d3448fb096464e0853d Merge: 71355e1 b10e5ac Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 4 00:24:56 2014 -0500

Merge remote-tracking branch 'public/bug13214_025_squashed'

changes/bug13214 | 7 +++++++ src/or/directory.c | 3 ++- src/or/rendcommon.c | 19 +++++++++++++++++++ src/or/rendcommon.h | 1 + 4 files changed, 29 insertions(+), 1 deletion(-)