Commit 2ed194c9 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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

parents edc3f706 a7ccd9a9

changes/bug32108

0 → 100644
+8 −0
Original line number Diff line number Diff line 
  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.

src/core/mainloop/mainloop.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */