commit e8708c2fbdbdcd751de74991f5bd1d15cc296362
Merge: b120d8b83 aebe8a82c
Author: Nick Mathewson <[email protected]>
Date: Thu Nov 15 16:47:25 2018 -0500
Merge branch 'maint-0.3.3' into release-0.3.3
changes/ticket26913 | 7 +++++++
doc/tor.1.txt | 6 ++++--
src/or/config.c | 21 +++++++++++++++++++--
3 files changed, 30 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
