aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Minor aesthetic fixes.Sandor Nemes2016-01-183-7/+5
* Merge branch 'master' into masterSandor Nemes2016-01-178-26/+141
|\
| * Merge pull request #872 from bazzinotti/inline-tcpMaximilian Hils2016-01-176-25/+100
| |\
| | * Add Inline Script Hooks to TCP modeMichael J. Bazzinotti2016-01-106-25/+100
| * | Merge pull request #887 from felixonmars/pillow-31Thomas Kriechbaumer2016-01-141-1/+1
| |\ \
| | * | Allow Pillow 3.1Felix Yan2016-01-141-1/+1
| |/ /
| * | Merge pull request #882 from tinius/sslstripMaximilian Hils2016-01-131-0/+40
| |\ \
| | * | no longer strips Accept-Encoding as mitmproxy can handle compressionNiko Kommenda2016-01-121-1/+0
| | * | added sslstrip to inline script examplesNiko Kommenda2016-01-121-0/+41
| |/ /
* | | Merge branch 'master' into masterSandor Nemes2016-01-135-18/+29
|\| |
| * | remove code duplicationThomas Kriechbaumer2016-01-101-6/+6
| * | Support writing to outfile from mitmwebChris Czub2016-01-103-10/+21
| * | Merge pull request #878 from warting/patch-1Maximilian Hils2016-01-081-2/+2
| |\ \
| | * | Update redirect_requests.pyStefan Wärting2016-01-081-2/+2
| |/ /
* / / Fixed a problem with the bind address not being used as the source address on...Sandor Nemes2016-01-087-7/+17
|/ /
* / fix #659Maximilian Hils2016-01-022-4/+10
|/
* clientcert tests: fix whitespaceMichael J. Bazzinotti2015-12-291-0/+2
* Merge pull request #870 from bazzinotti/masterMaximilian Hils2015-12-297-21/+48
|\
| * client-cert: Simplify and cleanupMichael J. Bazzinotti2015-12-294-22/+20
| * [docs/libmproxy/test] Support single client-side cert file as argument toMichael J. Bazzinotti2015-12-286-13/+42
|/
* Merge pull request #857 from jwilk/spellingMaximilian Hils2015-12-123-4/+4
|\
| * docs: fix typosJakub Wilk2015-12-123-4/+4
* | Merge pull request #855 from jvillacorta/masterMaximilian Hils2015-12-111-1/+1
|\ \ | |/ |/|
| * Add default ciphers to avoid issue with iOS9 App Transport SecurityJorge Villacorta2015-12-111-1/+1
|/
* Merge pull request #853 from dweinstein/warnings-to-stderrMaximilian Hils2015-12-101-1/+2
|\
| * TLS verification warnings write to stderrDavid Weinstein2015-12-101-1/+2
|/
* Merge commit '5db6275'Aldo Cortesi2015-12-041-0/+13
|\
| * ChangelogAldo Cortesi2015-12-041-0/+13
* | setup.py: document that we don't want to use '~='Maximilian Hils2015-12-031-1/+3
* | use latest netlib version for snapshotsMaximilian Hils2015-12-032-2/+2
* | remove docs directory from sdistMaximilian Hils2015-12-031-0/+1
|/
* bump versionMaximilian Hils2015-12-032-26/+28
* use version specifiers compatible with old setuptools releasesMaximilian Hils2015-12-031-22/+21
* Revert "make setup.py wheel-ready"Maximilian Hils2015-12-032-49/+66
* make setup.py wheel-readyMaximilian Hils2015-12-032-66/+49
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2015-12-031-3/+21
|\
| * appveyor: deploy binaries to snapshot serverMaximilian Hils2015-12-031-1/+11
| * appveyor: build binariesMaximilian Hils2015-12-031-3/+11
* | flow format compat: 0.14 -> 0.15Maximilian Hils2015-12-031-2/+9
* | test flow conversionMaximilian Hils2015-12-033-0/+87
|/
* fix #839Maximilian Hils2015-12-021-2/+4
* travis: retry snapshot uploadMaximilian Hils2015-12-021-1/+1
* add tnetstring inspection toolMaximilian Hils2015-12-021-0/+32
* add import capability for old flows, fix #840Maximilian Hils2015-12-022-7/+39
* remove docs from sdistMaximilian Hils2015-11-291-1/+0
* travis: don't install virtualenv manuallyMaximilian Hils2015-11-291-1/+0
* travis: fix osx binary build conditionMaximilian Hils2015-11-291-1/+1
* travis: build binaries on osxMaximilian Hils2015-11-291-4/+17
* disable concurrency tests on appveyorMaximilian Hils2015-11-292-2/+3
* lessen test race conditionsMaximilian Hils2015-11-292-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 20:26:48 +0000