2 files changed, 10 insertions, 3 deletions

diff --git a/OnionRouter.hs b/OnionRouter.hs
index 17cea8e8..1d43d05f 100644
--- a/OnionRouter.hs
+++ b/OnionRouter.hs
@@ -428,9 +428,12 @@ hookQueries or t8 tmethods = TransactionMethods
             case rr of
                 RouteRecord{ responseCount = 0
                            , timeoutCount  = c
-                           , routeVersion = v } | c >= 2 -> expireRoute
-                RouteRecord{ timeoutCount = c
                            , routeVersion = v } | c >= 5 -> expireRoute
+                RouteRecord{ responseCount = 1
+                           , timeoutCount = c
+                           , routeVersion = v } | c >= 10 -> expireRoute
+                RouteRecord{ timeoutCount = c
+                           , routeVersion = v } | c >= 20 -> expireRoute
                 _ -> return ()
         writeTChan (routeLog or) $ "ONION query can " ++ show (fmap pendingVersion mb, w8)
         dispatchCancel tmethods tid d
diff --git a/g b/g
index 64bdf356..4b8e922a 100755
--- a/g
+++ b/g
@@ -1,14 +1,18 @@
 #!/bin/bash
 
 rootname=$(cat /etc/debian_chroot 2>/dev/null)
+echo $PATH | grep '\.stack' >/dev/null && rootname="stack"
 
 warn="-freverse-errors -fwarn-unused-imports -Wmissing-signatures -fdefer-typed-holes"
 exts="-XOverloadedStrings -XRecordWildCards"
 defs="-DBENCODE_AESON -DTHREAD_DEBUG"
 hidden="crypto-random crypto-api crypto-numbers cryptohash prettyclass"
+[ "$rootname" == "stack" ] && hidden=""
 hide=""
 for h in $hidden;do
-        ghc-pkg latest $h && hide="$hide -hide-package $h"
+        # too slow.
+        # ghc-pkg latest $h && hide="$hide -hide-package $h"
+        hide="$hide -hide-package $h"
 done
 
 if [ "$rootname" == "stretch" ]