aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* docs: add instructions for transparent proxy on Linux for traffic originating...Tom Saleeba2019-08-011-0/+23
* 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
|\ \ | |/ |/|
| * Minor fix re. macOS stepsLucio Paiva2019-06-261-2/+2
|/
* Merge pull request #3480 from lusceu/masterMaximilian Hils2019-04-022-12/+28
|\
| * Fixed the exif .ksy files in the kaitai repo. Compiled the .ksy to python fil...ls2019-02-172-12/+28
* | Merge pull request #3490 from rjt-gupta/rjt-gupta-update-readmeMaximilian Hils2019-04-021-1/+1
|\ \
| * | simplify testing instructionsMaximilian Hils2019-04-021-7/+1
| * | Update README.rstRajat Gupta2019-02-281-0/+6
| |/
* | Merge pull request #3509 from ohhorob/patch-1Samoilenko Roman2019-03-301-1/+1
|\ \ | |/ |/|
| * Fix markdown typo on addons-scripting.mdRob Wills2019-03-291-1/+1
|/
* Merge pull request #3459 from RPigott/wsproto-updateThomas Kriechbaumer2019-01-312-49/+52
|\
| * removed whitespace in kwargsrpigott2019-01-311-4/+4
| * whitespace errorrpigott2019-01-301-1/+1
| * Separate client and server PerMessageDefalte extension per #3460rpigott2019-01-301-6/+10
| * update to wsproto 0.13rpigott2019-01-292-45/+44
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 11:21:35 +0000