merge conflicts

This commit is contained in:
benedettadavico
2026-04-20 14:07:38 +02:00
parent e6103e4c43
commit 0d031875f6
4 changed files with 2 additions and 2 deletions
+1
View File
@@ -1,5 +1,6 @@
[package]
name = "nym-client"
description = "Implementation of the Nym Client"
version = "1.1.75"
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
description = "Implementation of the Nym Client"
+1
View File
@@ -1,5 +1,6 @@
[package]
name = "nym-socks5-client"
description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
version = "1.1.75"
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"