aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3437 from yan12125/fix-tests-on-mojaveThomas Kriechbaumer2019-01-261-1/+5
|\
| * Fix a failing test on macOS MojaveChih-Hsuan Yen2018-12-291-1/+5
* | Merge pull request #3441 from petersmythe/patch-1Maximilian Hils2019-01-232-2/+2
|\ \
| * | Fix spacePeter Smythe2019-01-031-1/+1
| * | Fix spellingPeter Smythe2019-01-031-1/+1
| |/
* | Merge pull request #3451 from yjh0502/openbsd-docMaximilian Hils2019-01-231-1/+1
|\ \
| * | openbsd: divert-to requires exact listen addressJihyun Yu2019-01-181-1/+1
* | | Merge pull request #3453 from XZzYassin/patch-1Maximilian Hils2019-01-231-1/+1
|\ \ \
| * | | fixes copying on macosMumen Yassin2019-01-231-1/+1
|/ / /
* | | remove travis workaroundThomas Kriechbaumer2019-01-181-1/+0
* | | remove sudo:false flagThomas Kriechbaumer2019-01-181-1/+0
|/ /
* | Merge pull request #3444 from BoboTiG/fix-resource-leaksMaximilian Hils2019-01-065-9/+12
|\ \
| * | Fix ResourceWarning: unclosed file, prevent resource leaksMickaël Schoentgen2019-01-065-9/+12
| |/
* | Merge pull request #3443 from BoboTiG/fix-invalid-seq-warningsMaximilian Hils2019-01-0614-20/+20
|\ \ | |/ |/|
| * Fix several DeprecationWarning: invalid escape sequenceMickaël Schoentgen2019-01-0514-20/+20
|/
* Fix Flow being part of raw_format_flow cache keyBkPHcgQL3V2018-12-171-5/+5
* charset in meta tags (#3411)Rajat Gupta2018-12-132-16/+30
* fix query arrayRajat Gupta2018-12-035-13/+47
* Merge pull request #3403 from Kriechi/bump-depsThomas Kriechbaumer2018-12-0216-27/+30
|\
| * bump dependenciesThomas Kriechbaumer2018-12-0216-27/+30
|/
* Merge pull request #3401 from rjt-gupta/fix-replay-timestampsThomas Kriechbaumer2018-12-011-0/+2
|\
| * client-replay-fixrjt-gupta2018-12-011-0/+2
|/
* Merge pull request #3382 from abhigyank/orgThomas Kriechbaumer2018-11-123-21/+21
|\
| * Change variable o to organization for generated certficates.Abhigyan Khaund2018-11-113-21/+21
|/
* Add Organization field for the generated certificate (#3376)Abcdefghijklmnopqrstuvwxyzxyz2018-11-093-6/+28
* Merge pull request #3371 from JessicaFavin/proper-display-on-stderrMaximilian Hils2018-11-092-11/+41
|\
| * Remove indent on echo_errorJessicaFavin2018-11-041-3/+1
| * test_dumper.py - Add sio_err everywhere + adjust test_simpleJessica Favin2018-11-041-4/+26
| * Fix test_dumper.py - Dumper constructorJessica Favin2018-11-041-2/+2
| * Update test_dumper.pyJessica Favin2018-11-041-2/+4
| * Display errors on sys.stderrJessica Favin2018-11-011-3/+11
* | Merge pull request #3374 from abhigyank/docsMaximilian Hils2018-11-091-1/+1
|\ \ | |/ |/|
| * docs: don't make links extra boldMaximilian Hils2018-11-091-1/+1
| * docs: Add mitm.it link in the certificates docs.Abhigyan Khaund2018-11-051-1/+1
|/
* Merge pull request #3366 from alexlauerman/patch-3Maximilian Hils2018-10-261-1/+1
|\
| * Corrected keep_host_header usage optionAlex Lauerman2018-10-251-1/+1
|/
* Merge pull request #3356 from fghzxm/umask-keysSamoilenko Roman2018-10-252-2/+27
|\
| * use skip_windows decorator consistentlyMaximilian Hils2018-10-231-4/+2
| * Skip file permission test on WindowsFred Miller2018-10-231-0/+4
| * Make private keys readable only by the ownerFred Miller2018-10-222-2/+25
|/
* Merge pull request #3351 from arun-94/masterMaximilian Hils2018-10-213-1/+29
|\
| * Update snapshot testsArun Swaminathan2018-10-202-0/+10
| * Check for null flow response when changing colorArun Swaminathan2018-10-201-5/+5
| * #3312 Change colors according to HTTP status codeArun Swaminathan2018-10-151-1/+19
* | Merge pull request #3355 from kam800/configurable-lines-cutoffMaximilian Hils2018-10-204-5/+12
|\ \ | |/ |/|
| * Make content view lines limit configurableKamil Borzym2018-10-194-5/+12
|/
* Added link_expander.py example to simple examples (#3348)jbrule2018-10-122-0/+29
* Merge pull request #3344 from Tey/masterMaximilian Hils2018-10-101-5/+11
|\
| * Fixed doc about domain whitelistingTey2018-10-051-5/+11
* | Merge pull request #3334 from artnc/patch-1Thomas Kriechbaumer2018-10-101-1/+1
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 14:13:58 +0000