[tbb-commits] [tor-browser/tor-browser-45.6.0esr-6.5-1] Bug 20981: On Windows, check TZ for timezone first

[gk at torproject.org]

commit 025f08062d4e633432e0248bbd047ac5d61c4399
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Sat Jan 14 01:58:14 2017 -0800

    Bug 20981: On Windows, check TZ for timezone first
---
 intl/icu/source/common/putil.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/intl/icu/source/common/putil.cpp b/intl/icu/source/common/putil.cpp
index c87b60e..2f5f4fe 100644
--- a/intl/icu/source/common/putil.cpp
+++ b/intl/icu/source/common/putil.cpp
@@ -984,6 +984,11 @@ uprv_tzname(int n)
 {
     const char *tzid = NULL;
 #if U_PLATFORM_USES_ONLY_WIN32_API
+    char* envValue = getenv("TZ");
+    if (envValue != NULL) {
+        return uprv_strdup(envValue);
+    }
+
     tzid = uprv_detectWindowsTimeZone();
 
     if (tzid != NULL) {