diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-12-01 03:05:11 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-12-01 03:05:11 +0100 |
| commit | 40fbb95701a7172fe1b11f7432fb8dcf0f26b978 (patch) | |
| tree | 50ad30a5f72f9b1d0093fda9f1d0eb68ecac4b9a | |
| parent | 5b1fefee9bf8564b32a1137975cb181d54ef6dff (diff) | |
| parent | 807d0b9a5d7e848cfb56ee599b0b52608457ca4e (diff) | |
| download | mitmproxy-40fbb95701a7172fe1b11f7432fb8dcf0f26b978.tar.gz mitmproxy-40fbb95701a7172fe1b11f7432fb8dcf0f26b978.tar.bz2 mitmproxy-40fbb95701a7172fe1b11f7432fb8dcf0f26b978.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
| -rw-r--r-- | README.mkd | 8 | ||||
| -rwxr-xr-x | examples/flowbasic | 2 |
2 files changed, 2 insertions, 8 deletions
@@ -72,8 +72,7 @@ This installs the latest GitHub versions of mitmproxy, netlib and pathod into `m The test suite requires the `dev` extra requirements listed in [setup.py](https://github.com/mitmproxy/mitmproxy/blob/master/setup.py) and [pathod](http://pathod.net), version matching mitmproxy. Install these with: -` -pip install "mitmproxy[dev]""` +`pip install "mitmproxy[dev]"` Please ensure that all patches are accompanied by matching changes in the test @@ -85,8 +84,3 @@ suite. The project maintains 100% test coverage. Rendering the documentation requires [countershape](http://github.com/cortesi/countershape). After installation, you can render the documentation to the doc like this: `cshape doc-src doc` - - - - - diff --git a/examples/flowbasic b/examples/flowbasic index 41402b0c..c71debc9 100755 --- a/examples/flowbasic +++ b/examples/flowbasic @@ -36,7 +36,7 @@ class MyMaster(flow.FlowMaster): config = proxy.ProxyConfig( port=8080, - confdir="~/.mitmproxy/" # use ~/.mitmproxy/mitmproxy-ca.pem as default CA file. + cadir="~/.mitmproxy/" # use ~/.mitmproxy/mitmproxy-ca.pem as default CA file. ) state = flow.State() server = ProxyServer(config) |