nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.3'

Browse Source
This commit is contained in:
Roger Dingledine 2012-11-12 23:49:37 -05:00
commit a90affa84b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug7464 Normal file
View File

@ -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.

2
src/or/main.c
View File

@ -1218,7 +1218,7 @@ run_scheduled_events(time_t now)
if (router_rebuild_descriptor(1)<0) { if (router_rebuild_descriptor(1)<0) {
log_info(LD_CONFIG, "Couldn't rebuild router descriptor"); 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); router_upload_dir_desc_to_dirservers(0);
} }