diff --git a/trunk/src/or/main.c b/trunk/src/or/main.c
index c3de91c886..b93ee6e30c 100644
--- a/trunk/src/or/main.c
+++ b/trunk/src/or/main.c
@@ -862,6 +862,9 @@ static int do_main_loop(void) {
         return -1;
       } else {
         log_fn(LOG_DEBUG,"poll interrupted.");
+        /* You can't trust the results of this poll(). Go back to the
+         * top of the big for loop. */
+        continue;
       }
     }