commit 7a47379f252b4d277df7c289f8a9d3160b50eee0
Merge: 1a5be3c5e f6b30a97a
Author: Nick Mathewson <[email protected]>
Date: Fri Jun 29 13:06:16 2018 -0400
Merge branch 'maint-0.3.4'
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
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
