diff -r 218ca8526ec0 -r 6096d27dc119 mercurial/chgserver.py
--- a/mercurial/chgserver.py	Thu May 11 08:49:33 2017 -0700
+++ b/mercurial/chgserver.py	Wed May 10 11:55:22 2017 -0700
@@ -75,7 +75,8 @@
 # sensitive environment variables affecting confighash
 _envre = re.compile(r'''\A(?:
                     CHGHG
-                    |HG(?:[A-Z].*)?
+                    |HG(?:DEMANDIMPORT|EMITWARNINGS|MODULEPOLICY|PROF|RCPATH)?
+                    |HG(?:ENCODING|PLAIN).*
                     |LANG(?:UAGE)?
                     |LC_.*
                     |LD_.*