commit c8a7b7b585d46a5504b764a71ae9d17edf8c3b20 Merge: 35fbec371 633e99575 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 15 12:52:54 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

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