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

[nickm at torproject.org]

commit c7d0096f9ddde0d8663b40f17110ded40309e09a
Merge: dd8eeabfd 23c4592ee
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 09:42:30 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/trove-2017-008 | 5 +++++
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)