Merge branch 'maint-0.3.3' into maint-0.3.4

src/or/connection_edge.c

@@ -4187,4 +4187,3 @@ connection_edge_free_all(void)
   pending_entry_connections = NULL;
   mainloop_event_free(attach_pending_entry_connections_ev);
 }
-