aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-31 10:51:09 -0400
committerNick Mathewson <nickm@torproject.org>2014-03-31 10:51:09 -0400
commitf82e499aa58be77ac91b04eedbc43409681100d0 (patch)
tree25ec01002d9bcb89ae316eab066fb2d2d7f2f44e
parent5e0cfba969e886b2f1769b70c425de658b229e9f (diff)
parentbfe783f167d4d88123117a460cde652707bdb2ef (diff)
downloadtor-f82e499aa58be77ac91b04eedbc43409681100d0.tar
tor-f82e499aa58be77ac91b04eedbc43409681100d0.tar.gz
Merge remote-tracking branch 'public/bug11342'
-rw-r--r--changes/bug113424
-rw-r--r--src/or/routerparse.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug11342 b/changes/bug11342
new file mode 100644
index 000000000..a52a5515e
--- /dev/null
+++ b/changes/bug11342
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - When dumping a malformed directory object to disk, save it in binary
+ mode on windows, not text mode. Fixes bug 11342; bugfix on
+ 0.2.2.1-alpha.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 422278a5f..7bf9a4d8e 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -572,7 +572,7 @@ dump_desc(const char *desc, const char *type)
char *content = tor_malloc_zero(filelen);
tor_snprintf(content, filelen, "Unable to parse descriptor of type "
"%s:\n%s", type, desc);
- write_str_to_file(debugfile, content, 0);
+ write_str_to_file(debugfile, content, 1);
log_info(LD_DIR, "Unable to parse descriptor of type %s. See file "
"unparseable-desc in data directory for details.", type);
tor_free(content);