diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-16 23:03:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-16 23:03:41 -0400 |
| commit | 973661394abc393e3dfd5b82de86659ecadc72a4 (patch) | |
| tree | 01656cbb45711c0c8800786c386d65c1f1e24c01 /changes | |
| parent | 211b8cc31846e2d2ba75f19ab9f319f18cb70cfb (diff) | |
| parent | f9719b078141fb1a4a0eee281031c73cffde7c30 (diff) | |
| download | tor-973661394abc393e3dfd5b82de86659ecadc72a4.tar.gz tor-973661394abc393e3dfd5b82de86659ecadc72a4.zip | |
Merge branch '10267_plus_10896_rebased_twice'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/10267_tproxy | 4 | ||||
| -rw-r--r-- | changes/10896 | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/changes/10267_tproxy b/changes/10267_tproxy new file mode 100644 index 0000000000..f65e4a2c5d --- /dev/null +++ b/changes/10267_tproxy @@ -0,0 +1,4 @@ + o Minor features: + - Support the ipfw firewall interface for transparent proxy support on + FreeBSD. To enable it, set "TransProxyType ipfw" in your torrc. + Resolves ticket 10267; patch from "yurivict". diff --git a/changes/10896 b/changes/10896 new file mode 100644 index 0000000000..278815e766 --- /dev/null +++ b/changes/10896 @@ -0,0 +1,8 @@ + o Minor features: + - Support OpenBSD's divert-to rules with the pf firewall, when + "TransProxyType pf-divert" is specified. This allows Tor to run a + TransPort transparent proxy port on OpenBSD 4.4 or later without + root privileges. See the pf.conf(5) manual page for information on + configuring pf to use divert-to rules. Closes ticket 10896; patch + from Dana Koch. + |