diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
| commit | b51363b3ca43f6572acb673186e6ae78a1f48434 (patch) | |
| tree | a7488b32871c142141a813dc6ff2ede172672c31 /doc-src/transparent/osx.html | |
| parent | 4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff) | |
| parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
| download | mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2 mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip | |
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
Diffstat (limited to 'doc-src/transparent/osx.html')
| -rw-r--r-- | doc-src/transparent/osx.html | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/doc-src/transparent/osx.html b/doc-src/transparent/osx.html index c1ae823d..c8eb6c4e 100644 --- a/doc-src/transparent/osx.html +++ b/doc-src/transparent/osx.html @@ -7,7 +7,7 @@ OSX. <ol class="tlist"> - <li> <a href="@!urlTo('ssl.html')!@">Install the mitmproxy + <li> <a href="@!urlTo('certinstall.html')!@">Install the mitmproxy certificates on the test device</a>. </li> <li> Enable IP forwarding: @@ -76,6 +76,3 @@ want to intercept your OSX traffic, you should use an external host to run mitmproxy. None the less, pf is flexible to cater for a range of creative possibilities, like intercepting traffic emanating from VMs. See the **pf.conf** man page for more. - - - |