Merge 7b53be7ecc into 969b2369ce

Merge branch 'master' into master
Reword Zrok description
2025-07-10 17:53:23 +00:00 · 2023-08-21 05:48:37 +00:00 · 2023-08-20 22:48:32 -07:00 · 2023-08-20 22:48:25 -07:00 · 2023-08-15 11:03:49 -07:00 · 2023-08-15 11:03:15 -07:00
1 changed files with 1 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1659,6 +1659,7 @@ _Related: [Web Servers](#web-servers)_
 - [Squid](http://www.squid-cache.org/) - Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It reduces bandwidth and improves response times by caching and reusing frequently-requested web pages. ([Source Code](https://code.launchpad.net/squid)) `GPL-2.0` `C`
 - [SWAG (Secure Web Application Gateway)](https://github.com/linuxserver/docker-swag) - Nginx webserver and reverse proxy with PHP support, built-in Certbot (Let's Encrypt) client and fail2ban integration. `GPL-3.0` `Docker`
 - [Tinyproxy](https://tinyproxy.github.io/) - Light-weight HTTP/HTTPS proxy daemon. ([Source Code](https://github.com/tinyproxy/tinyproxy)) `GPL-2.0` `C`
+- [zrok](https://zrok.io/) - Open source serveo/ngrok alternative. Creates network tunnels that allow sharing locally running services and other private resources with others over the public Internet using OpenZiti. ([Source Code](https://github.com/openziti/zrok)) `Apache-2.0` `Go`


 ### Recipe Management
Author	SHA1	Message	Date
Noah Betzen	545f29c9e9	Merge `7b53be7ecc` into `969b2369ce`	2023-08-21 05:48:37 +00:00
Noah Betzen	7b53be7ecc	Merge branch 'master' into master	2023-08-20 22:48:32 -07:00
Noah Betzen	035ce99679	Reword Zrok description	2023-08-20 22:48:25 -07:00
Noah Betzen	224a8476d7	Merge branch 'master' into master	2023-08-15 11:03:49 -07:00
Noah Betzen	908d5ca909	Tweak zrok description	2023-08-15 11:03:15 -07:00
Noah Betzen	8b5f8930be	Add Zrok to Proxy section	2023-08-11 10:12:57 -07:00