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

[nickm at torproject.org]

commit b39c50cde8b1d7e3e27d5a6fc2e58ff208982637
Merge: 1cf11b694 a2aaf9509
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 16:29:43 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0
    
     Conflicts:
            src/or/rendservice.c

 changes/bug24895     |  8 ++++++++
 src/or/rendservice.c | 26 ++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)