diff --git a/Cargo.lock b/Cargo.lock index a37d5b1e..312374d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1392,7 +1392,7 @@ dependencies = [ [[package]] name = "g3proxy" -version = "1.7.24" +version = "1.7.25" dependencies = [ "ahash", "anyhow", @@ -2652,9 +2652,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" dependencies = [ "ring", "untrusted", diff --git a/g3proxy/CHANGELOG b/g3proxy/CHANGELOG index 77c941e9..3260d99a 100644 --- a/g3proxy/CHANGELOG +++ b/g3proxy/CHANGELOG @@ -1,4 +1,12 @@ +v1.7.25: + - Feature: add route_geoip escaper + - Feature: various improvements to journal logging + - add SYSLOG_IDENTIFIER field + - improved efficiency + - io stats added + - Feature: update vendored openssl to 3.1 + v1.7.24: - BUG FIX: fix vendoring build of ring diff --git a/g3proxy/Cargo.toml b/g3proxy/Cargo.toml index f241da32..4bdec0cf 100644 --- a/g3proxy/Cargo.toml +++ b/g3proxy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "g3proxy" -version = "1.7.24" +version = "1.7.25" license.workspace = true edition.workspace = true rust-version = "1.72.0" diff --git a/g3proxy/debian/changelog b/g3proxy/debian/changelog index 7270721e..0779b03f 100644 --- a/g3proxy/debian/changelog +++ b/g3proxy/debian/changelog @@ -1,5 +1,5 @@ -g3proxy (1.7.24-1) UNRELEASED; urgency=medium +g3proxy (1.7.25-1) UNRELEASED; urgency=medium * New upstream release. - -- G3proxy Maintainers Sat, 02 Sep 2023 17:54:13 +0800 + -- G3proxy Maintainers Tue, 12 Sep 2023 17:52:58 +0800 diff --git a/g3proxy/doc/conf.py b/g3proxy/doc/conf.py index b658d36f..986b2f86 100644 --- a/g3proxy/doc/conf.py +++ b/g3proxy/doc/conf.py @@ -22,7 +22,7 @@ copyright = '2023, Zhang Jingqiang' author = 'Zhang Jingqiang' # The full version, including alpha/beta/rc tags -release = '1.7.24' +release = '1.7.25' # -- General configuration --------------------------------------------------- diff --git a/g3proxy/g3proxy.spec b/g3proxy/g3proxy.spec index 95c900db..ca70efa7 100644 --- a/g3proxy/g3proxy.spec +++ b/g3proxy/g3proxy.spec @@ -13,7 +13,7 @@ %define build_profile release-lto Name: g3proxy -Version: 1.7.24 +Version: 1.7.25 Release: 1%{?dist} Summary: Generic proxy for G3 Project @@ -70,5 +70,5 @@ install -m 644 -D %{name}/service/g3proxy@.service %{buildroot}/lib/systemd/syst %changelog -* Sat Sep 02 2023 G3proxy Maintainers - 1.7.24-1 +* Tue Sep 12 2023 G3proxy Maintainers - 1.7.25-1 - New upstream release