Merge remote-tracking branch 'asn/bug21142'

changes/bug21142

@@ -0,0 +1,4 @@
+  o Minor bugfixes (client, guards):
+    - Fix bug where Tor would think that there are circuits waiting for better
+      guards even though those circuits have been freed. Fixes bug #21142;
+      bugfix on 0.3.0.1-alpha.

src/or/circuitlist.c

@@ -1858,6 +1858,9 @@ circuit_about_to_free(circuit_t *circ)
     if (circuits_pending_chans)
       smartlist_remove(circuits_pending_chans, circ);
   }
+  if (circuits_pending_other_guards) {
+    smartlist_remove(circuits_pending_other_guards, circ);
+  }
   if (CIRCUIT_IS_ORIGIN(circ)) {
     control_event_circuit_status(TO_ORIGIN_CIRCUIT(circ),
      (circ->state == CIRCUIT_STATE_OPEN ||