Added -F http[s]://server:port option that allows MITM to forward traffic to another http server upstream.
Reverse proxy works with SSL
New method establish_ssl to avoid duplicated code
Update android.html

Make the sdcard path in the text consistent with the screen shot (android-shellwgetmitmproxyca.png).

/sdcard/Download (singular) is the correct path.
Merge pull request #173 from joebowbeer/patch-1

Update android.html
add serverconnect script hook
attempt to fix https://github.com/mitmproxy/netlib/issues/24
Fix divide by zero issue when timestamp start and end are the same
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into 0.10
Merge branch 'fix_invalid_tcp_close'
Add a note to the docs about pf redirection of traffic from the host itself.
Merge pull request #184 from richie5um/RichS-RateDivideByZeroIssue

Fix divide by zero issue when timestamp start and end are the same
Merge pull request #180 from mitmproxy/add_serverconnection_scripthook

Add serverconnection scripthook
Remove obsolete test.
Merge pull request #170 from jsoriano/master

Reverse proxy works with SSL
Merge pull request #166 from ghjc/forward-proxy

Added -F http[s]://server:port option that allows MITM to forward traffi...
Merge pull request #134 from mhils/scripts_improvements

Support multiple scripts and script arguments. refs #76
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/0.10' into 0.10