Merge remote-tracking branch 'teor/bug14002-osx-transproxy-ipfw-pf'

This commit is contained in:
Nick Mathewson
2014-12-21 13:37:40 -05:00
2 changed files with 13 additions and 5 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes:
- OS X uses ipfw (FreeBSD) or pf (OpenBSD). Update the transparent
proxy option checks to allow for both ipfw and pf on OS X.
Fixes bug 14002.