summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-13 16:52:20 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-13 16:52:20 -0400
commitec29cae8d7e97d652a87d753d93e4289e5a0ed26 (patch)
tree0ccbb8b876fe994216de16df0a928c5222477bcf /src
parentc73b35d4288af17920e4a93ff88d759dea685b86 (diff)
parent1ea155b28fbe15408d96019ef0a75fe0c74ac39d (diff)
downloadtor-ec29cae8d7e97d652a87d753d93e4289e5a0ed26.tar.gz
tor-ec29cae8d7e97d652a87d753d93e4289e5a0ed26.zip
Merge branch '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);