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

[nickm at torproject.org]

commit 3ec72ef52aa3fa9871335b1713e090e3677987d7
Merge: 235083308 f97f301b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 12:13:40 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug24480     | 3 +++
 src/or/rendservice.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)