commit 0f6770826748d85f40cdfba08bdb298d0c02edca
Merge: ec2af981d 8803930de
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Jun 24 13:36:47 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug30956 | 4 ++++
doc/tor.1.txt | 6 ++++--
src/feature/relay/router.c | 17 +++++++++++------
3 files changed, 19 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
