Merge remote-tracking branch 'tor-github/pr/1920/head'

This commit is contained in:
Nick Mathewson 2020-06-05 10:12:00 -04:00
commit f548f1475b

2
.gitignore vendored
View File

@ -79,11 +79,9 @@ uptime-*.json
/callgraph/
# /contrib/
/contrib/dist/tor.sh
/contrib/dist/torctl
/contrib/dist/tor.service
/contrib/operator-tools/tor.logrotate
/contrib/dist/suse/tor.sh
# /debian/
/debian/files