commit 15d42383833341c9e0c859ba3998ea70eccd74af
Merge: 8bea0c2fa caa55a6d3
Author: Nick Mathewson <[email protected]>
Date: Tue Apr 23 15:39:23 2019 -0400
Merge remote-tracking branch 'tor-github/pr/944'
changes/bug29613 | 5 +++++
doc/tor.1.txt | 18 ++++++++++--------
scripts/maint/practracker/exceptions.txt | 2 +-
src/config/torrc.sample.in | 6 ++----
src/core/or/policies.c | 20 ++++++++++++++------
5 files changed, 32 insertions(+), 19 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
