Repository navigation

Merge upstream/main to unblock pyOpenSSL 26.x bump - #4

Merged

ibrahim halatci (ihalatci) merged 31 commits into

mainfrom

merge/upstream-main

May 28, 2026

Commits on Apr 12, 2026
- reopen main for development
  mitmproxy release bot
  committed
  5dbbd14
Commits on Apr 13, 2026
Commits on Apr 19, 2026
- Use sys.executable instead of python3 in docs build script (#8183)
  
  Vitaly (optinsoft)
  and
  autofix-ci[bot]
  authored
  c9b063b
Commits on Apr 25, 2026
- fix: avoid IndexError in is_mostly_bin for short tails (#8196)
  
  Julio César Suástegui (juliosuas)
  and
  autofix-ci[bot]
  authored
  a8fbfc7
Commits on Apr 28, 2026
- Fix IP blocking and merge additional DoH blocklists (#8197)
  Olexandr88
  authored
  ab470e5
Commits on May 9, 2026
- Bump upper bounds for cryptography and pyOpenSSL (#8219)
  
  Paul Kehrer (reaperhulk)
  and
  autofix-ci[bot]
  authored
  3dd268a
Commits on May 11, 2026
Commits on May 12, 2026
- Rename mitmweb XSRF cookie to `_mitmproxy_xsrf` to recover broken Firefox sessions (#8224)
  
  Copilot
  and
  Maximilian Hils (mhils)
  authored
  6bc7f0a
- Update CHANGELOG.md
  Maximilian Hils (mhils)
  authored
  f9c2b44
- mitmproxy 12.2.3
  mitmproxy release bot
  committed
  6c09d56
- reopen main for development
  mitmproxy release bot
  committed
  e875daf
- Bump requests from 2.32.5 to 2.33.1 (#8230)
  
  dependabot[bot]
  and
  autofix-ci[bot]
  authored
  b9958b2
- Bump awscli from 1.44.63 to 1.44.69 in the deploy group (#8228)
  
  dependabot[bot]
  and
  autofix-ci[bot]
  authored
  2f6f251
- Bump types-requests from 2.32.4.20260107 to 2.33.0.20260327 in the mypy group (#8225)
  
  dependabot[bot]
  and
  autofix-ci[bot]
  authored
  48e58be
- Web: Remove Bootstrap dependency and keep mitmweb styling parity (#8147)
  
  Matteo Luppi (lups2000)
  and
  autofix-ci[bot]
  authored
  e33503d
- Update urwid requirement from <=3.0.5,>=2.6.14 to >=2.6.14,<=4.0.0 (#8229)
  
  dependabot[bot]
  and
  autofix-ci[bot]
  authored
  e7ad119
- Bump the tox group across 1 directory with 2 updates (#8226)
  
  dependabot[bot]
  and
  autofix-ci[bot]
  authored
  fb8c1a9
Commits on May 15, 2026
- fix(web): render AVIF images and IANA icon favicons in the response tab (#8232)
  
  Ariel (ariel42)
  and
  autofix-ci[bot]
  authored
  e20a24b
- fix(web): avoid infinite componentDidUpdate loop in FlowTable (#8233)
  
  authored
  a4518ab
Commits on May 16, 2026
- fix(web): preserve in-progress filter input across parent re-renders (#8234)
  
  authored
  782af06
Commits on May 21, 2026
- Treat carriage return as whitespace in strutils.is_xml (#8243)
  
  authored
  12a292c
Commits on May 28, 2026
- Merge upstream/main into citusdata/main
  ibrahim halatci (ihalatci)
  committed
  d19c601

Commits

Commits on Apr 12, 2026

Commits on Apr 13, 2026

Commits on Apr 19, 2026

Commits on Apr 25, 2026

Commits on Apr 28, 2026

Commits on May 9, 2026

Commits on May 11, 2026

Commits on May 12, 2026

Commits on May 15, 2026

Commits on May 16, 2026

Commits on May 21, 2026

Commits on May 28, 2026