summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/or/connection_edge.c4
-rw-r--r--src/or/routers.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 9a563bf9b4..88ce66999c 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -53,6 +53,10 @@ int connection_edge_process_inbuf(connection_t *conn) {
return 0;
case AP_CONN_STATE_OPEN:
case EXIT_CONN_STATE_OPEN:
+ if(conn->package_window <= 0) {
+ log_fn(LOG_WARN,"called with package_window %d. Tell Roger.", conn->package_window);
+ return 0;
+ }
if(connection_edge_package_raw_inbuf(conn) < 0) {
connection_edge_end(conn, END_STREAM_REASON_MISC, conn->cpath_layer);
return -1;
diff --git a/src/or/routers.c b/src/or/routers.c
index 9ae174ce79..fb2598561d 100644
--- a/src/or/routers.c
+++ b/src/or/routers.c
@@ -713,7 +713,7 @@ router_resolve_directory(directory_t *dir)
for (i = 0; i < max; ++i) {
remove = 0;
if (router_resolve(dir->routers[i])) {
- log_fn(LOG_WARN, "Couldn't resolve router %s; removing",
+ log_fn(LOG_WARN, "Couldn't resolve router %s; not using",
dir->routers[i]->address);
remove = 1;
} else if (options.Nickname &&