Merge branch 'bug5105-v2-squashed'

Conflicts: src/or/transports.c
2024-12-06 19:41:15 +01:00 · 2012-02-17 11:50:10 -05:00
parent 3cdc46457f 773290c09a
commit eaedcba493
5 changed files with 536 additions and 191 deletions
@@ -0,0 +1,11 @@
+  o Minor bugfixes:
+
+    - Ensure that variables set in Tor's environment cannot override
+      environment variables which Tor tries to pass to a managed
+      pluggable-transport proxy.  Previously, Tor would pass every
+      variable in its environment to managed proxies along with the
+      new ones, in such a way that on many operating systems, the
+      inherited environment variables would override those which Tor
+      tried to explicitly set.  Bugfix on 0.2.3.12-alpha for most
+      Unixoid systems; bugfix on 0.2.3.9-alpha for Windows.
+