diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-14 13:05:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-14 13:05:16 -0400 |
| commit | 4fdce6b091181f01295270eedb23ef7735904635 (patch) | |
| tree | b98709f3ea2749bc8aa0785e3df878d7eb360b51 /src/or/main.c | |
| parent | 7e57609a9fff3f5050c5f20050686c6eb470f31f (diff) | |
| parent | aa212b173c340536eb94b4978174b068ead89cb1 (diff) | |
| download | tor-4fdce6b091181f01295270eedb23ef7735904635.tar tor-4fdce6b091181f01295270eedb23ef7735904635.tar.gz | |
Merge remote-tracking branch 'asn-mytor/bug5589_take2'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/or/main.c b/src/or/main.c index 3e913d968..5c5dbf160 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1142,7 +1142,6 @@ run_scheduled_events(time_t now) static int should_init_bridge_stats = 1; static time_t time_to_retry_dns_init = 0; static time_t time_to_next_heartbeat = 0; - static int has_validated_pt = 0; const or_options_t *options = get_options(); int is_server = server_mode(options); @@ -1550,14 +1549,6 @@ run_scheduled_events(time_t now) if (!net_is_disabled() && pt_proxies_configuration_pending()) pt_configure_remaining_proxies(); - /** 11c. validate pluggable transports configuration if we need to */ - if (!has_validated_pt && - (options->Bridges || options->ClientTransportPlugin)) { - if (validate_pluggable_transports_config() == 0) { - has_validated_pt = 1; - } - } - /** 12. write the heartbeat message */ if (options->HeartbeatPeriod && time_to_next_heartbeat <= now) { |