commit 115fb2a8440d9b5f84bd84525aaf9cd6a4bfab9d
Merge: d94715e2d 1e6ffeaea
Author: Nick Mathewson <[email protected]>
Date: Thu Nov 15 16:37:41 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket27550 | 5 +++++
src/or/directory.c | 2 +-
src/or/hs_client.c | 4 ----
src/or/hs_descriptor.c | 9 ++++++---
4 files changed, 12 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
