aboutsummaryrefslogtreecommitdiffstats
path: root/doc-src/features/socksproxy.html
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-10-23 16:17:03 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-10-23 16:17:03 +0200
commit77c9f64526fb49f8787d85c879d7ff6bc91d7f56 (patch)
treea5ee61de0e2a45c7c94ab90edba6efd39bffec71 /doc-src/features/socksproxy.html
parent4bf07d8aa5b137cf39282502cc960b88ba40a790 (diff)
parent6bed0764609029e9d01b1d28b7826fb37ab20d3e (diff)
downloadmitmproxy-77c9f64526fb49f8787d85c879d7ff6bc91d7f56.tar.gz
mitmproxy-77c9f64526fb49f8787d85c879d7ff6bc91d7f56.tar.bz2
mitmproxy-77c9f64526fb49f8787d85c879d7ff6bc91d7f56.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Conflicts: doc-src/modes.html
Diffstat (limited to 'doc-src/features/socksproxy.html')
-rw-r--r--doc-src/features/socksproxy.html10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc-src/features/socksproxy.html b/doc-src/features/socksproxy.html
new file mode 100644
index 00000000..f436cbf5
--- /dev/null
+++ b/doc-src/features/socksproxy.html
@@ -0,0 +1,10 @@
+
+In this mode, mitmproxy acts as a SOCKS5 proxy server.
+
+<table class="table">
+ <tbody>
+ <tr>
+ <th width="20%">command-line</th> <td>--socks</td>
+ </tr>
+ </tbody>
+</table>