commit d7e0dc0056e5a82e298eb404f81c516f46657456 Merge: 49da1e9f6 796e36e53 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Oct 15 10:48:35 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
src/common/util_bug.h | 7 ++++++-
src/or/hs_common.c | 7 +++----
2 files changed, 9 insertions(+), 5 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
