chore: merge XXX to master

(cherry picked from commit 3f78f4d672)

Changelog.md

@@ -3,25 +3,6 @@
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
 
-## Grunwald Bridge 3.17.0
-
-### Added
-* BRIDGE-271: Report version file check failure to Sentry.
-* BRIDGE-247: Test: Automate Bridge 0% update rollout.
-* BRIDGE-248: Test: Additional Bridge UI e2e automation tests.
-
-### Changed
-* BRIDGE-73: Update goopenpgp.
-* BRIDGE-287: Update x/net and x/crypto dependencies.
-* BRIDGE-303: Update govulncheck to latest release.
-* BRIDGE-226: Bump Go version to 1.23.4.
-* BRIDGE-288: Extension to synchronization update handler, observability tweaks and gluon update.
-
-### Fixed
-* BRIDGE-291: Use correct field for user plan type.
-* BRIDGE-143: Add missing QML component attribute, cut/paste disabled on read-only text areas.
-
-
 ## Flavien Bridge 3.16.0
 
 ### Added

Makefile

@@ -12,7 +12,7 @@ ROOT_DIR:=$(realpath .)
 .PHONY: build build-gui build-nogui build-launcher versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=3.17.0+git
+BRIDGE_APP_VERSION?=3.16.0+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 APP_FULL_NAME:=Proton Mail Bridge
 APP_VENDOR:=Proton AG

utils/govulncheck.sh

@@ -28,6 +28,10 @@ main(){
     jq -r '.finding | select( (.osv != null) and (.trace[0].function != null) ) | .osv ' < vulns.json > vulns_osv_ids.txt
 
     ignore GO-2023-2328 "GODT-3124 RESTY race condition"
+    ignore GO-2025-3373 "BRIDGE-315 stdlib crypto/x509"
+    ignore GO-2025-3420 "BRIDGE-315 stdlib net/http"
+    ignore GO-2025-3447 "BRIDGE-315 stdlib crypto/internal/nistec"
+
     has_vulns
 
     echo

utils/vault-editor/main.go

@@ -19,6 +19,7 @@
 
 package main
 
+// Minor comment on vault editor DELETE ME.
 import (
 	"fmt"
 	"io"