diff options
-rw-r--r-- | src/or/router.c | 1 | ||||
-rw-r--r-- | src/or/routerlist.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/or/router.c b/src/or/router.c index 032f3969e0..ba25292c9e 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -352,6 +352,7 @@ int init_keys(void) { if(!cp) { log_fn(LOG_INFO,"Cached directory %s not present. Ok.",keydir); } else { + tor_strstrip(cp,"\r"); /* XXXX Workaround for win32 read_file_to_str bug. */ if(dirserv_load_from_directory_string(cp) < 0){ log_fn(LOG_ERR, "Cached directory %s is corrupt", keydir); tor_free(cp); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2c79c39075..cb63ee5072 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -64,6 +64,7 @@ int router_reload_router_list(void) snprintf(filename,sizeof(filename),"%s/cached-directory", get_data_directory(&options)); s = read_file_to_str(filename,0); if (s) { + tor_strstrip(s,"\r"); /* XXXX This is a bug workaround for win32. */ log_fn(LOG_INFO, "Loading cached directory from %s", filename); if (router_load_routerlist_from_directory(s, NULL, 0) < 0) { log_fn(LOG_WARN, "Cached directory '%s' was unparseable; ignoring.", filename); |