commit 63c5e09a4093dc72f11c08078fe81c34c5d40ba5 Merge: e97adaf8d f93ee8e4c Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 16 19:10:05 2018 -0400

Merge remote-tracking branch 'tor-github/pr/408'

src/feature/hs/hs_cell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)