tor

commit 1ea155b28fbe15408d96019ef0a75fe0c74ac39d
parent e6d2059751da008a1fb00b42039eb4cbc638e638
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 13 Jul 2017 16:52:16 -0400

Merge branch 'bug22520_031' into maint-0.3.1

Diffstat:
A
changes/bug22520
 | 
5
+++++
M
src/common/compat.c
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug22520 b/changes/bug22520
@@ -0,0 +1,5 @@
+  o Minor bugfixes (error reporting, windows):
+    - When formatting Windows error messages, use the English format
+      to avoid codepage issues. Fixes bug 22520; bugfix on
+      0.1.2.8-alpha. Patch from "Vort".
+
diff --git a/src/common/compat.c b/src/common/compat.c
@@ -3261,7 +3261,7 @@ format_win32_error(DWORD err)
                  FORMAT_MESSAGE_FROM_SYSTEM |
                  FORMAT_MESSAGE_IGNORE_INSERTS,
                  NULL, err,
-                 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                 MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
                  (LPVOID)&str,
                  0, NULL);