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

[nickm at torproject.org]

commit b2e500f95b7f685b05da5702e62944dbaa9faef2
Merge: 91c60d7 7519584
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 4 09:43:16 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug21825    |  6 ++++++
 src/or/hs_service.c | 12 +++---------
 src/or/hs_service.h | 15 +++++----------
 3 files changed, 14 insertions(+), 19 deletions(-)