diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-11-12 23:49:37 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-11-12 23:49:37 -0500 |
| commit | a90affa84b3597667fd5dc8d9ff761a462653750 (patch) | |
| tree | d461e9e81dda47c14e839b559b435026e6a03ad7 | |
| parent | f473d83deaf893c6efe49094cfc5d9b435e7fcb9 (diff) | |
| parent | 88bb48e785609afeab6b63677f789036e25b34cf (diff) | |
| download | tor-a90affa84b3597667fd5dc8d9ff761a462653750.tar.gz tor-a90affa84b3597667fd5dc8d9ff761a462653750.zip | |
Merge branch 'maint-0.2.3'
| -rw-r--r-- | changes/bug7464 | 4 | ||||
| -rw-r--r-- | src/or/main.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug7464 b/changes/bug7464 new file mode 100644 index 0000000000..9259cc74a3 --- /dev/null +++ b/changes/bug7464 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a harmless bug when opting against publishing a relay descriptor + because DisableNetwork is set. Fixes bug 7464; bugfix on + 0.2.3.9-alpha. diff --git a/src/or/main.c b/src/or/main.c index 0ba28db05e..fd8f9413de 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1218,7 +1218,7 @@ run_scheduled_events(time_t now) if (router_rebuild_descriptor(1)<0) { log_info(LD_CONFIG, "Couldn't rebuild router descriptor"); } - if (advertised_server_mode() & !options->DisableNetwork) + if (advertised_server_mode() && !options->DisableNetwork) router_upload_dir_desc_to_dirservers(0); } |