Merge branch 'maint-0.4.7'

changes/bug40673

@@ -1,5 +1,5 @@
   o Minor bugfixes (relay overload statistics):
-    - Count total create cells vs dropped rate cells properly, when
+    - Count total create cells vs dropped create cells properly, when
       assessing if our fraction of dropped cells is too high. We only
       count non-client circuits in the denominator, but we would include
       client circuits in the numerator, leading to surprising log lines

changes/ticket40680

@@ -0,0 +1,6 @@
+  o Minor feature (relay, DoS):
+    - Apply circuit creation anti-DoS defenses if the outbound circuit max cell
+      queue size is reached too many times. This introduces two new consensus
+      parameters to control the queue size limit and number of times allowed to
+      go over that limit. Close ticket 40680.
+