[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

nickm at torproject.org nickm at torproject.org
Fri Jun 29 17:06:30 UTC 2018


commit bedfacc6cbc0536852b4ba56c56ccf5f48439d4e
Merge: 4b0a0938c f6b30a97a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:06:15 2018 -0400

    Merge branch 'maint-0.3.4' into release-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(-)



More information about the tor-commits mailing list