torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0

Browse Source
This commit is contained in:
teor
2019-04-09 11:35:41 +10:00
parent 61e6b217c5 5613968d57
commit 92e8bdf296
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/feature/nodelist/networkstatus.c
+5 -2
View File
@@ -1761,8 +1761,11 @@ reload_consensus_from_file(const char *fname,
flavor, flags, source_dir);
#ifdef _WIN32
if (rv < 0 && tor_memstr(map->data, map->size, "\r\n")) {
log_info(LD_GENERAL, "Found CRLF in consensus file %s; falling back to "
"read_file_to_string.", escaped(fname));
log_notice(LD_GENERAL, "Looks like the above failures are probably "
"because of a CRLF in consensus file %s; falling back to "
"read_file_to_string. Nothing to worry about: this file "
"was probably saved by an earlier version of Tor.",
escaped(fname));
char *content = read_file_to_str(fname, RFTS_IGNORE_MISSING, NULL);
rv = networkstatus_set_current_consensus(content, strlen(content),
flavor, flags, source_dir);