commit cb8557f7c93abc8b770f1753d2e39dafb2a9fe3b Merge: dd9cebf b432efb Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 21 09:00:40 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug19464 | 6 ++++++ src/or/rendservice.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-)