[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit 71267bef4c64b791346f8cdd54f3be4cc3fc38ca
Merge: 79f9e63 28e1aa1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 11 12:36:55 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug18761     |  3 +++
 src/or/rendservice.c | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)