commit 13209eb6f34165eb72ecd4425770cba6af4f5391
Merge: 0ddd8f0 c9534f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 1 12:50:36 2015 -0400
    Merge remote-tracking branch 'dgoulet/bug15296_027_01'
 src/or/rendcommon.c |    1 -
 1 file changed, 1 deletion(-)