commit cc1943bf6e567224cea834e7fac3967582074c3e Merge: b54626f a324d7e Author: Nick Mathewson nickm@torproject.org Date: Mon May 18 11:29:50 2015 -0400

Merge remote-tracking branch 'dgoulet/bug16021_027_01'

src/or/rendcommon.h | 1 + src/test/test_hs.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+)