diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-23 11:05:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-23 11:05:54 -0400 |
| commit | 830492fbdaef92ecf82c5bfde9373a2a2d9157d3 (patch) | |
| tree | fbb0dd2090c9587ac0a054dd1ab6978b643546ef /src/or/config.c | |
| parent | 9fb86c82da9afff11b05783777dc83f80b835178 (diff) | |
| parent | 29c28d312cc1d14cafe73f7f8fc64272123ae04e (diff) | |
| download | tor-830492fbdaef92ecf82c5bfde9373a2a2d9157d3.tar.gz tor-830492fbdaef92ecf82c5bfde9373a2a2d9157d3.zip | |
Merge branch 'bug11156_issue2_squashed'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index a5407dd4ea..c3ddb5c311 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1445,6 +1445,12 @@ options_act(const or_options_t *old_options) sweep_transport_list(); sweep_proxy_list(); + /* Start the PT proxy configuration. By doing this configuration + here, we also figure out which proxies need to be restarted and + which not. */ + if (pt_proxies_configuration_pending() && !net_is_disabled()) + pt_configure_remaining_proxies(); + /* Bail out at this point if we're not going to be a client or server: * we want to not fork, and to log stuff to stderr. */ if (!running_tor) |