Merge remote-tracking branch 'origin/main' into atavism/7.9.3

go.mod

@@ -40,7 +40,7 @@ require (
 	github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65
 	github.com/getlantern/i18n v0.0.0-20181205222232-2afc4f49bb1c
 	github.com/getlantern/idletiming v0.0.0-20231030193830-6767b09f86db
-	github.com/getlantern/ipproxy v0.0.0-20240814224926-09e7b93597a6
+	github.com/getlantern/ipproxy v0.0.0-20240820014622-25f78a719601
 	github.com/getlantern/jibber_jabber v0.0.0-20210901195950-68955124cc42
 	github.com/getlantern/launcher v0.0.0-20230622120034-fe87f9bff286
 	github.com/getlantern/mtime v0.0.0-20200417132445-23682092d1f7

go.sum

@@ -339,8 +339,8 @@ github.com/getlantern/idletiming v0.0.0-20190529182719-d2fbc83372a5/go.mod h1:MG
 github.com/getlantern/idletiming v0.0.0-20200228204104-10036786eac5/go.mod h1:McaLC6faRlxJ9QjjqSjpEeYIjKnKA8+dzjoR+eYXCio=
 github.com/getlantern/idletiming v0.0.0-20231030193830-6767b09f86db h1:w/Br8vclvX3RlHV+VFkuNkcm3hwEXTtqXMoOqKPUicg=
 github.com/getlantern/idletiming v0.0.0-20231030193830-6767b09f86db/go.mod h1:kW4RHAFReMopujQCzcYxjOAg4XZOeuSrybIcM9FNGto=
-github.com/getlantern/ipproxy v0.0.0-20240814224926-09e7b93597a6 h1:5u/JMbi3gMkMDRdVbryMJjMP+LITKJGuw4HOHGsEp9c=
-github.com/getlantern/ipproxy v0.0.0-20240814224926-09e7b93597a6/go.mod h1:HBpifstxisocH2egSW+swGkKkySODJoz4ZQPV+MB+Fk=
+github.com/getlantern/ipproxy v0.0.0-20240820014622-25f78a719601 h1:5/fpDs7Q93lRhGAEUrHxcM1Xe+WeQ5/9X7fJIAeyFl0=
+github.com/getlantern/ipproxy v0.0.0-20240820014622-25f78a719601/go.mod h1:92FdkgwWJHrmSm/A2F6GuOXZi/a1qiCs+Oxagsbp6Yw=
 github.com/getlantern/iptool v0.0.0-20210721034953-519bf8ce0147/go.mod h1:hfspzdRcvJ130tpTPL53/L92gG0pFtvQ6ln35ppwhHE=
 github.com/getlantern/iptool v0.0.0-20230112135223-c00e863b2696 h1:D7wbL2Ww6QN5SblEDMiQcFulqz2jgcvawKaNBTzHLvQ=
 github.com/getlantern/iptool v0.0.0-20230112135223-c00e863b2696/go.mod h1:hfspzdRcvJ130tpTPL53/L92gG0pFtvQ6ln35ppwhHE=