summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-26 13:37:13 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-26 13:37:13 -0400
commitff796ad0874fdeaa86a96f01532d8d5dba26ed30 (patch)
tree59184b82b8eedd29b5f7b5cdecb293fe5096b4e6
parent7b09282dc723381e68fef79c3474a56315a0edfa (diff)
downloadtor-ff796ad0874fdeaa86a96f01532d8d5dba26ed30.tar.gz
tor-ff796ad0874fdeaa86a96f01532d8d5dba26ed30.zip
Remove connection_ap_attach_pending() from per-second callback.
In 25374, we created the necessary post-loop event for scheduling connection_ap_attach_pending as needed. Before that, we were already running this event once per mainloop. There's no reason to also run it once per second. Closes ticket 25933. No changes file, since the relevant change is already in 25374. Or possibly in 17590, depending on how you look at it.
-rw-r--r--src/or/main.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/main.c b/src/or/main.c
index ffe4073295..717f2cf82a 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1697,12 +1697,6 @@ run_scheduled_events(time_t now)
circuit_expire_old_circs_as_needed(now);
}
- if (!net_is_disabled()) {
- /* This is usually redundant with circuit_build_needed_circs() above,
- * but it is very fast when there is no work to do. */
- connection_ap_attach_pending(0);
- }
-
/* 5. We do housekeeping for each connection... */
channel_update_bad_for_new_circs(NULL, 0);
int i;