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

commit df1bae8f0f80addb1dafa6c9dfc22020431a42b6 Merge: 27b04b8ba 3bca705c5 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)