commit ec638e2368fb4dbd2a9a593e45a5cbcb756f4c07 Merge: e7827a2b7 6b2ef2c55 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 15 12:52:54 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

src/or/hs_intropoint.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)