Merge branch 'maint-0.3.3' into maint-0.3.4

diff --cc src/or/connection_edge.c
index 046369af60d5b840721ad6329c56fce3ad27bf7d,003f84adb3e42d02a2ee64b9b99c88db81858db1..a21002fcad456d29db99103ac71d6f259b9c6730
--- 1/src/or/connection_edge.c
--- 2/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@@ -4185,6 -4165,4 +4185,5 @@@ connection_edge_free_all(void
    untried_pending_connections = 0;
    smartlist_free(pending_entry_connections);
    pending_entry_connections = NULL;
 +  mainloop_event_free(attach_pending_entry_connections_ev);
  }
-