From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Jan 2018 21:29:43 +0000 (-0500)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.0
X-Git-Tag: tor-0.3.1.10~22^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmaint-0.3.0;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.0

 Conflicts:
        src/or/rendservice.c
---

b39c50cde8b1d7e3e27d5a6fc2e58ff208982637