commit f18ee7fc7287e9d5f55c7c6c2007a8a1c2466a3e Merge: c8cb556 8acf525 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 18 11:30:01 2015 -0400

Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6

changes/bug16381 | 13 +++++++++++++ src/or/rendcommon.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-)