commit 97dfe87be0b2e0aa3fd8db3926d9b66ec2373a01
Merge: 0f85e059b f82f8179e
Author: Nick Mathewson <ni...@torproject.org>
Date: Fri Jun 29 13:06:15 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
changes/ticket26467 | 3 +++
src/or/directory.c | 1 +
src/or/hs_descriptor.c | 1 +
src/test/hs_test_helpers.c | 6 ++++++
src/test/test_channelpadding.c | 2 ++
src/test/test_hs_descriptor.c | 11 +++++------
6 files changed, 18 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
