Merge stable branch and bump version

SPECS/lokinet.spec

@@ -1,5 +1,5 @@
 Name:           lokinet
-Version:        0.9.9
+Version:        0.9.11
 Release:        1%{?dist}
 Summary:        Lokinet anonymous, decentralized overlay network
 
@@ -23,7 +23,7 @@ BuildRequires:  libsqlite3x-devel
 
 # Changes the default dns listener to 127.0.0.1:953 because Fedora's systemd-resolved doesn't like
 # talking to 127.3.2.1:53 for unknown reasons.
-Patch1: default-dns.patch
+# Patch1: default-dns.patch
 
 Requires: lokinet-bin = %{version}-%{release}
 %{?systemd_requires}
@@ -153,6 +153,11 @@ fi
 %systemd_postun lokinet.service
 
 %changelog
+* Thurs Dec 15 2022 Technical Tumbleweed <necro_nemesis@hotmail.com> - 0.9.11-1
+- bump version
+- remove dns Patch1
+- remove external/date submodule
+- external/oxen-logging & gui submodule added during merge
 * Wed Jun 29 2022 Technical Tumbleweed <necro_nemesis@hotmail.com> - 0.9.9-1
 - bump version
 - cmake flags for no system library search

external/date

@@ -1 +0,0 @@
-Subproject commit cac99da8dc88be719a728dc1b597b0ac307c1800

external/oxen-logging

@@ -0,0 +1 @@
+Subproject commit 9f2323a2db5fc54fe8394892769eff859967f735

gui

@@ -0,0 +1 @@
+Subproject commit 37f274e86fea7fe0fcc472727398d118a6917854