commit 321c1c453e4ee757be7df823da28b0f4af7ae60a Merge: b1c7e5d 7519584 Author: Nick Mathewson <[email protected]> Date: Tue Apr 4 09:43:23 2017 -0400
Merge branch 'maint-0.3.0'
changes/bug21825 | 6 ++++++
src/or/hs_service.c | 12 +++---------
src/or/hs_service.h | 15 +++++----------
3 files changed, 14 insertions(+), 19 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
