Merge branch 'master' into dev

Conflicts: src/mainwindow.cpp
2022-02-11 08:31:23 -05:00
parent 5825b30e71 06702a65bb
commit 60815a95b0
2 changed files with 8 additions and 0 deletions
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -842,6 +842,8 @@ void MainWindow::setupSettingsModal() {
        settings.cmbServer->addItem("https://devo.crabdance.com");
        settings.cmbServer->addItem("https://lite.nyami.org");
        settings.cmbServer->addItem("https://poop.granitefone.me:9067");
+        settings.cmbServer->addItem("https://lite.hushpool.is");
+
        //settings.cmbServer->addItem("https://hush.leto.net:5420");
        //TODO: seperate lists of https/Tor servers, only show user or attempt
        // connection to .onion if user has it enabled