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

[nickm at torproject.org]

commit be30c61ac1553cf4401c832019e213be907c0711
Merge: 6cdd024 273b267
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 25 08:53:46 2015 -0500

    Merge branch 'maint-0.2.7'

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