[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit cf131890643a6db64e39dee7ef1d7fef3d19b16c
Merge: a839ed5 b432efb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 21 09:00:37 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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