diff --git a/bin/psyconf b/bin/psyconf
index 8437ed2..7f121d2 100755
--- a/bin/psyconf
+++ b/bin/psyconf
@@ -376,7 +376,9 @@ X
$torify = "torsocks";
say "Enabling PSYC federation over Tor: Using "
. "torsocks wrapper around psyced.\n";
- say "Warning: Maybe, if you install unbound.conf, it actually works.\n"
+ say "Warning: Make sure either dnsmasq.conf or "
+ . "unbound.conf are in\n"
+ . "place for .onion resolution to function.\n";
}
}
## ldmud bug number two
diff --git a/tor/dnsmasq.conf b/tor/dnsmasq.conf
new file mode 100644
index 0000000..3d6ccb9
--- /dev/null
+++ b/tor/dnsmasq.conf
@@ -0,0 +1,8 @@
+# if you already have dnsmasq on your system,
+# this should go into /etc/dnsmasq.conf:
+
+server=/onion/127.0.0.1#9053
+
+# or you can pass --server=/onion/127.0.0.1#9053
+# to dnsmasq on the command line
+
diff --git a/tor/unbound.conf b/tor/unbound.conf
index 9534aa0..6f7d450 100644
--- a/tor/unbound.conf
+++ b/tor/unbound.conf
@@ -1,7 +1,8 @@
-# tell a localhost "unbound" DNS server to
-# forward .onion requests into Tor
-# courtesy of tg of secushare.org
+# if you don't want dnsmasq on your system you
+# can tell a localhost "unbound" DNS server to
+# forward .onion requests into Tor.
#
+# courtesy of tg of secushare.org
# see the unbound.conf(5) man page for more.
server:
diff --git a/world/default/en/jabber.textdb b/world/default/en/jabber.textdb
index 6430f5c..485c966 100644
--- a/world/default/en/jabber.textdb
+++ b/world/default/en/jabber.textdb
@@ -159,7 +159,13 @@ _failure_filter_strangers
|{_failure_unsupported_function_whisper}{_failure_filter_strangers}
_failure_unsuccessful_delivery_timeout_dialback
-|## happens so frequently it is mostly just annoying
+|## happens so frequently it is mostly just annoying (and breaks OTR)
+
+_failure_unsuccessful_delivery_resolve
+|## happens almost as frequently and users don't care to know
+
+_failure_unsuccessful_delivery_repeated
+|## do users want to know the complete truth about federation?
_notice_received_email_UNUSED
|{_notice_received_email}