aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3603 from tomsaleeba/patch-1Thomas Kriechbaumer2019-09-281-0/+25
|\
| * docs: correct command to install mitmproxyTom Saleeba2019-08-011-1/+3
| * docs: add instructions for transparent proxy on Linux for traffic originating...Tom Saleeba2019-08-011-0/+23
* | Merge pull request #3600 from king6cong/masterThomas Kriechbaumer2019-09-281-11/+5
|\ \
| * | fix pf.conf on macOSking6cong2019-07-301-11/+5
| |/
* | Merge pull request #3646 from ahopkins/patch-1Thomas Kriechbaumer2019-09-281-0/+3
|\ \
| * | Update concepts-certificates.mdAdam Hopkins2019-09-241-0/+3
* | | Merge pull request #3648 from Eluch/masterThomas Kriechbaumer2019-09-281-1/+1
|\ \ \
| * | | ssl_insecure added to option_whitelist because it was missingFerenc soós2019-09-271-1/+1
|/ / /
* | | Merge pull request #3593 from Jessonsotoventura/tabularMaximilian Hils2019-09-269-25/+496
|\ \ \ | |/ / |/| |
| * | Updated Setup.pyJesson Soto Ventura2019-09-241-1/+1
| * | Merge branch 'master' into tabularJesson Soto Ventura2019-09-2412-24/+48
| |\ \ | |/ / |/| |
* | | Merge pull request #3631 from mhils/lintMaximilian Hils2019-09-056-18/+17
|\ \ \
| * | | lintMaximilian Hils2019-09-056-18/+17
* | | | Merge pull request #3627 from RamiBerm/patch-1Maximilian Hils2019-09-051-1/+4
|\ \ \ \
| * | | | make dict comprehension more readableMaximilian Hils2019-09-051-1/+4
| * | | | Updated har_dump,py timings dictionary functionRamiBerm2019-09-031-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #3630 from tsaaristo/encode-zstandardMaximilian Hils2019-09-056-5/+27
|\ \ \ \ | |_|/ / |/| | |
| * | | encoding: add support for zstd (zstandard)Tero Saaristo2019-09-056-5/+27
| |/ /
* / / lintMaximilian Hils2019-09-051-0/+1
|/ /
| * Fixed Duration on list viewJesson Soto Ventura2019-09-241-2/+3
| * TLD and SLD are now highlighted using publicsuffixJesson Soto Ventura2019-09-243-17/+26
| * Fixed linting issuesJesson Soto Ventura2019-07-217-17/+17
| * Added console_flowlist_layout optionJesson Soto Ventura2019-07-215-13/+125
| * Merge branch 'tabular' of github.com:Jessonsotoventura/mitmproxy into tabularJesson Soto Ventura2019-07-211-1/+8
| |\
| | * Added Color palettes for lowlight, lowdark, solarized light, and solarized darkJesson Soto Ventura2019-07-212-6/+67
| * | Merge branch 'tabular' of https://github.com/BkPHcgQL3V/mitmproxy into tabularJesson Soto Ventura2019-07-211-1/+2
| |\|
| | * Tabular list flowBkPHcgQL3V2018-12-194-75/+356
| * | Added Color palettes for lowlight, lowdark, solarized light, and solarized darkJesson Soto Ventura2019-07-212-6/+67
| * | Tabular list flowBkPHcgQL3V2019-07-214-75/+356
|/ /
* | Merge pull request #3591 from mhils/miscMaximilian Hils2019-07-191-1/+1
|\ \
| * | fix addon deconstructionMaximilian Hils2019-07-181-1/+1
|/ /
* | Merge pull request #3587 from mhils/yaml-listMaximilian Hils2019-07-181-1/+3
|\ \
| * | fix sequence option declaration in yaml filesMaximilian Hils2019-07-181-1/+3
* | | remove unused dependencyMaximilian Hils2019-07-181-3/+0
* | | Merge pull request #3586 from mhils/issue-py38compatMaximilian Hils2019-07-181-1/+2
|\ \ \ | |/ / |/| |
| * | fix py38 compatMaximilian Hils2019-07-181-1/+2
|/ /
* | Merge pull request #3516 from pierlon/remove-confdir-argumentMaximilian Hils2019-07-172-8/+1
|\ \
| * | Remove the confdir argumentPierre Gordon2019-04-092-8/+1
* | | Merge pull request #3542 from ZHRhodes/patch-1Maximilian Hils2019-07-171-1/+1
|\ \ \
| * | | Update howto-wireshark-tls.mdZHRhodes2019-05-161-1/+1
| |/ /
* | | Merge pull request #3547 from felixonmars/brotliMaximilian Hils2019-07-172-2/+2
|\ \ \
| * | | update pyinstallerMaximilian Hils2019-07-171-1/+1
| * | | Use Brotli instead of brotlipyFelix Yan2019-05-271-1/+1
| |/ /
* | | Merge pull request #3525 from tonyb486/bugfix-dateheaderMaximilian Hils2019-07-173-3/+3
|\ \ \
| * | | update formatdate for cookies and tests to use GMT formattingAnthony Biondo2019-04-162-2/+2
| * | | Fix #3502 by using email.utils.formatdate's usegmt argument.Anthony Biondo2019-04-161-1/+1
| |/ /
* | | Merge pull request #3580 from MathieuBordere/mathieu/3567-ReplaceMaskerMaximilian Hils2019-07-171-6/+10
|\ \ \
| * | | websockets: replace masker with more optimized oneMathieu Borderé2019-07-061-6/+10
|/ / /
* | | Merge pull request #3570 from luciopaiva/patch-1Thomas Kriechbaumer2019-07-031-2/+2
|\ \ \ | |/ / |/| |