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

[nickm at torproject.org]

commit 28e1aa111803bc3548e00503ab56de5f3d41c7fc
Merge: e71dfb6 b59d791
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 11 12:36:27 2016 -0400

    Merge branch 'bug18761_028_squashed' into maint-0.2.8

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