Merge remote-tracking branch 'origin/master'

This commit is contained in:
Patrick Schleizer 2017-03-14 13:43:18 +00:00
commit dc2c9a9992
No known key found for this signature in database
GPG Key ID: CB8D50BB77BB3C48

View File

@ -42,7 +42,7 @@ surface by enabling superfluous functionality such as IRC parsing in
the kernel (!) the kernel (!)
Hence, this package disables this feature by shipping the Hence, this package disables this feature by shipping the
/etc/sysctl.d/nf_conntrack_helper.conf configuration file. /etc/modprobe.d/30_nf_conntrack_helper_disable.conf configuration file.
(This package description has been [automatically](https://github.com/Whonix/whonix-developer-meta-files/blob/master/debug-steps/packaging-helper-script) extracted and mirrored from `debian/control`.) (This package description has been [automatically](https://github.com/Whonix/whonix-developer-meta-files/blob/master/debug-steps/packaging-helper-script) extracted and mirrored from `debian/control`.)