瀏覽代碼

Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2

Nick Mathewson 4 年之前
父節點
當前提交
2ed194c9a9
共有 2 個文件被更改,包括 9 次插入1 次删除
  1. 8 0
      changes/bug32108
  2. 1 1
      src/core/mainloop/mainloop.c

+ 8 - 0
changes/bug32108

@@ -0,0 +1,8 @@
+  o Major bugfixes (relay):
+    - Relays now respect their AccountingMax bandwidth again. When relays
+      entered "soft" hibernation (which typically starts when we've hit
+      90% of our AccountingMax), we had stopped checking whether we should
+      enter hard hibernation. Soft hibernation refuses new connections and
+      new circuits, but the existing circuits can continue, meaning that
+      relays could have exceeded their configured AccountingMax. Fixes
+      bug 32108; bugfix on 0.4.0.1-alpha.

+ 1 - 1
src/core/mainloop/mainloop.c

@@ -1388,7 +1388,7 @@ STATIC periodic_event_item_t mainloop_periodic_events[] = {
   /* This is a legacy catch-all callback that runs once per second if
    * we are online and active. */
   CALLBACK(second_elapsed, NET_PARTICIPANT,
-           FL(NEED_NET)|FL(RUN_ON_DISABLE)),
+           FL(RUN_ON_DISABLE)),
 
   /* XXXX Do we have a reason to do this on a callback? Does it do any good at
    * all?  For now, if we're dormant, we can let our listeners decay. */