[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm@xxxxxxxxxxxxxx]

commit f82f8179e65c5e0021da46fd24e4bd7d8126d8f7
Merge: df896ed63 68dfbd5ef
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jun 29 13:06:15 2018 -0400

    Merge branch 'maint-0.3.2' into maint-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@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits