mercurial/windows.py

--- a/mercurial/windows.py	Mon Mar 13 08:53:31 2017 -0700
+++ b/mercurial/windows.py	Mon Mar 13 09:11:08 2017 -0700
@@ -442,7 +442,7 @@
         try:
             val = winreg.QueryValueEx(winreg.OpenKey(s, key), valname)[0]
             # never let a Unicode string escape into the wild
-            return encoding.tolocal(val.encode('UTF-8'))
+            return encoding.unitolocal(val)
         except EnvironmentError:
             pass