4 files changed, 8 insertions, 6 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 83e8c24f..4b5a1fd7 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -571,9 +571,11 @@ clientSession s@Session{..} sock cnum h = do
                         ks <- atomically $ myKeyPairs roster
                         skey <- maybe (return Nothing) (atomically . dhtSecretKey)
                                       $ Map.lookup netname dhts
-                        hPutClient h . showReport $ map mkrow ks ++ case skey >>= encodeSecret of
-                            Just x  -> [("",""),("dht-key:",B.unpack x)]
-                            Nothing -> []
+                        hPutClient h . showReport $ (map mkrow ks ++) $ fromMaybe [] $ do
+                            sk <- skey
+                            let pk = Tox.key2id $ toPublic sk
+                            x <- encodeSecret sk
+                            Just [("",""),("dht-key:",""),(B.unpack x, show pk)]
                  | ("sel",_:expr) <- break isSpace s -> do
                          ks <- atomically $ map (show . Tox.key2id . snd) <$> myKeyPairs roster
                          case find (isInfixOf expr) ks of
diff --git a/src/DPut.hs b/src/DPut.hs
index ff828112..121105fb 100644
--- a/src/DPut.hs
+++ b/src/DPut.hs
@@ -11,7 +11,7 @@ import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
 
 -- | Debug Tags, add more as needed, but ensure XAnnounce is always first, XMisc last
-data DebugTag = XAnnounce | XBitTorrent | XDHT | XLan | XMan | XNetCrypto | XOnion | XPing | XRefresh | XWLog | XMisc
+data DebugTag = XAnnounce | XBitTorrent | XDHT | XLan | XMan | XNetCrypto | XOnion | XRoutes | XPing | XRefresh | XWLog | XMisc
     deriving (Eq,Ord,Show,Read,Enum,Bounded)
 
 appName :: String
diff --git a/src/Network/QueryResponse.hs b/src/Network/QueryResponse.hs
index 3ee6d945..d612ac05 100644
--- a/src/Network/QueryResponse.hs
+++ b/src/Network/QueryResponse.hs
@@ -577,6 +577,7 @@ serializeClient c = do
                , clientLeaveQuery = \tid didRespond -> putMVar mvar ()
                }
 
+retardSend :: Int -> Client err meth tid addr x  -> IO (Client err meth tid addr x)
 retardSend micros client = do
     mvar <- newMVar () :: IO (MVar ())
     return client { clientEnterQuery = \tid -> do
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index efddc2a0..fcfa872f 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -445,8 +445,7 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
     let lookupClose _ = return Nothing
 
     mkrouting <- DHT.newRouting addr crypto updateIP updateIP
-    let ignoreErrors _ = return () -- Set this to (dput XMisc) to debug onion route building.
-    orouter <- newOnionRouter ignoreErrors
+    orouter <- newOnionRouter $ dput XRoutes
     (cryptonet,dhtcrypt,onioncrypt,dtacrypt,handshakes) <- toxTransport crypto orouter lookupClose udp
 
     let dhtnet0 = layerTransportM (DHT.decrypt crypto) (DHT.encrypt crypto) dhtcrypt