mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tor-github/pr/978' into maint-0.4.0

Browse source
This commit is contained in:
George Kadianakis 2019-04-30 19:26:14 +03:00
commit e1d4e2badb
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.

6
src/feature/nodelist/networkstatus.c
View file

@ -2033,7 +2033,7 @@ 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));
} }
@ -2048,7 +2048,7 @@ 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));
} }
@ -2115,7 +2115,7 @@ 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));
} }