aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix #506Legend Tang2015-03-063-19/+23
* clean up web buildsMaximilian Hils2015-03-0522-8881/+11140
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-03-043-13/+40
|\
| * Merge pull request #500 from sunu/masterMaximilian Hils2015-03-043-13/+40
| |\
| | * Minor refactor to PR #496Tarashish Mishra2015-03-042-11/+13
| | * sorted timing information by timestampMarcelo Glezer2015-03-031-21/+18
| | * removed unused parameterMarcelo Glezer2015-03-031-1/+1
| | * minor refactorMarcelo Glezer2015-03-031-5/+4
| | * added timing information to FlowDetailViewMarcelo Glezer2015-03-031-8/+32
| | * fixed formatting and added a 'test' (sort of)Marcelo Glezer2015-03-023-18/+14
| | * #487 added microsecond support to format_timestamp and used in FlowDetailView...Marcelo Glezer2015-03-022-10/+19
| | * Merge pull request #2 from mitmproxy/masterMarcelo Glezer2015-03-0218-51/+220
| | |\ | | |/ | |/|
* | | update docsMaximilian Hils2015-03-041-2/+6
* | | Documentation for the client side certificate is addedsentient072015-03-031-1/+4
|/ /
* | Merge pull request #489 from tekii/feature-487Maximilian Hils2015-03-023-8/+31
|\ \
| * | changes requested by @mhilsMarcelo Glezer2015-03-011-9/+2
| * | added to flowlist / flowdetail time elapsed between request sent and response...Marcelo Glezer2015-02-263-1/+31
| |/
* | do some housekeepingMaximilian Hils2015-03-022-39/+39
* | Merge pull request #493 from elitest/masterMaximilian Hils2015-03-022-10/+19
|\ \
| * | Update Server.py to fix SNI handlingelitest2015-03-021-1/+1
| * | Update Config.py to clarify help messageselitest2015-03-011-2/+2
| * | Update config.pyelitest2015-03-011-1/+1
| * | Un-executable'd setup.pyJim Shaver2015-03-011-0/+0
| * | specified cipher_list in a few more locations, added a missing commaJim Shaver2015-03-013-3/+5
| * | Update Server.py to improve cipher selectionelitest2015-02-281-1/+2
| * | Update Config.py to improve cipher selectionelitest2015-02-281-5/+11
* | | Merge pull request #492 from mitmproxy/entrypointsMaximilian Hils2015-03-021-1/+7
|\ \ \ | |/ / |/| |
| * | use entry_points for Windows supportMaximilian Hils2015-02-271-1/+7
* | | SSLKEYLOGFILE docsMaximilian Hils2015-02-283-0/+10
* | | fix #319Maximilian Hils2015-02-276-22/+43
* | | Merge remote-tracking branch 'sakurai/feature/issue319'Maximilian Hils2015-02-273-1/+28
|\ \ \ | |/ / |/| |
| * | Correct typo; https://github.com/mitmproxy/mitmproxy/issues/319Youhei Sakurai2015-02-271-1/+1
| * | Change from checking __call__ to using callable;Youhei Sakurai2015-02-272-2/+2
| * | Modify example to notify incompatibility with --stream SIZE command lineYouhei Sakurai2015-02-271-0/+8
| * | Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319Youhei Sakurai2015-02-273-1/+20
| |/
* | add example inline script for dns spoofing, refs #486Maximilian Hils2015-02-272-0/+36
* | always include SNI as SAN entryMaximilian Hils2015-02-271-3/+4
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-02-276-46/+235
|\|
| * Merge pull request #474 from tekii/feature-426Maximilian Hils2015-02-135-14/+70
| |\
| | * added sni and ssl_established=true in ServerConnection. removed check for Non...Marcelo Glezer2015-02-122-5/+4
| | * less is moreMarcelo Glezer2015-02-121-3/+1
| | * added ClientConnection and ServerConnection to new requestMarcelo Glezer2015-02-121-3/+14
| | * removed useless try exceptMarcelo Glezer2015-02-121-5/+6
| | * fixed typosMarcelo Glezer2015-02-121-2/+2
| | * missing str in http.parse_urlMarcelo Glezer2015-02-111-1/+1
| | * renamed add_request to create_request and added a tiny docstringMarcelo Glezer2015-02-112-2/+8
| | * set sni to None when no server_conn is NoneMarcelo Glezer2015-02-101-2/+4
| | * request is absoluteMarcelo Glezer2015-02-101-1/+1
| | * added support for creating new requests. still wip (not working for https)Marcelo Glezer2015-02-104-12/+51
| |/
| * Merge pull request #467 from mitmproxy/clipboardMaximilian Hils2015-02-084-32/+165
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-31 09:03:16 +0000