tree ac974955b24e4d2cc8bca5b8ac6db30117b0b1e6
parent 40f0df7e0d9cac2ddcba45c19fcbf96566a3b690
parent d1319c64d79b04f7b03d294f1fbced8b35f43ab9
author David Ostrovsky <david@ostrovsky.org> 1610567893 +0100
committer David Ostrovsky <david@ostrovsky.org> 1610567893 +0100

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Update jetty version to 9.4.35.v20201120

Change-Id: I97edf8fb6c5f97df93aff2ef62b710cd08c780ef