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.4.0'

Browse Source
This commit is contained in:
George Kadianakis 2019-04-30 19:26:30 +03:00
commit 847fc3280d
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug29930 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (UI):
- Lower log level of unlink() errors during bootstrap. Fixes bug 29930;
bugfix on 0.4.0.1-alpha.

18
src/feature/nodelist/networkstatus.c
View File

@ -2034,9 +2034,9 @@ networkstatus_set_current_consensus(const char *consensus,
* latest consensus. */ * latest consensus. */
if (was_waiting_for_certs && from_cache) if (was_waiting_for_certs && from_cache)
if (unlink(unverified_fname) != 0) { if (unlink(unverified_fname) != 0) {
log_warn(LD_FS, log_debug(LD_FS,
"Failed to unlink %s: %s", "Failed to unlink %s: %s",
unverified_fname, strerror(errno)); unverified_fname, strerror(errno));
} }
} }
goto done; goto done;
@ -2049,9 +2049,9 @@ networkstatus_set_current_consensus(const char *consensus,
} }
if (was_waiting_for_certs && (r < -1) && from_cache) { if (was_waiting_for_certs && (r < -1) && from_cache) {
if (unlink(unverified_fname) != 0) { if (unlink(unverified_fname) != 0) {
log_warn(LD_FS, log_debug(LD_FS,
"Failed to unlink %s: %s", "Failed to unlink %s: %s",
unverified_fname, strerror(errno)); unverified_fname, strerror(errno));
} }
} }
goto done; goto done;
@ -2116,9 +2116,9 @@ networkstatus_set_current_consensus(const char *consensus,
waiting->set_at = 0; waiting->set_at = 0;
waiting->dl_failed = 0; waiting->dl_failed = 0;
if (unlink(unverified_fname) != 0) { if (unlink(unverified_fname) != 0) {
log_warn(LD_FS, log_debug(LD_FS,
"Failed to unlink %s: %s", "Failed to unlink %s: %s",
unverified_fname, strerror(errno)); unverified_fname, strerror(errno));
} }
} }