commit 960d9894159ebd830e41db7ed9ae4e166235e331 Merge: 7c99a4ddd 55580d063 Author: David Goulet <dgoulet@torproject.org> Date: Thu Aug 29 08:56:04 2019 -0400 Merge branch 'tor-github/pr/1257' src/feature/hs/hs_circuit.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)