summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-13 16:52:16 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-13 16:52:16 -0400
commit1ea155b28fbe15408d96019ef0a75fe0c74ac39d (patch)
treec1a0a66f369289be708af7e74299d8aea9416dd3 /src
parente6d2059751da008a1fb00b42039eb4cbc638e638 (diff)
parent63ceadb485f6618da99e8a3b7822ede8da27989d (diff)
downloadtor-1ea155b28fbe15408d96019ef0a75fe0c74ac39d.tar.gz
tor-1ea155b28fbe15408d96019ef0a75fe0c74ac39d.zip
Merge branch 'bug22520_031' into maint-0.3.1
Diffstat (limited to 'src')
-rw-r--r--src/common/compat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/compat.c b/src/common/compat.c
index 3bea626903..4d110aba35 100644
--- 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);