tor

commit 1d48712c286981d56c1b3c56b3fc38adc31a1343
parent 9d24a352c01414b14c3ffe02541508345ca32a10
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  1 Aug 2017 11:21:19 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

Diffstat:
A
changes/bug18100
 | 
5
+++++
M
src/or/connection_edge.c
 | 
4
++--

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/bug18100 b/changes/bug18100
@@ -0,0 +1,5 @@
+  o Major bugfixes (linux TPROXY support):
+    - Fix a typo that had prevented TPROXY-based transparent proxying from
+      working under Linux. Fixes bug 18100; bugfix on 0.2.6.3-alpha.
+      Patch from "d4fq0fQAgoJ".
+
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
@@ -1987,8 +1987,8 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req)
   socklen_t orig_dst_len = sizeof(orig_dst);
   tor_addr_t addr;
 
-#ifdef TRANS_TRPOXY
-  if (options->TransProxyType_parsed == TPT_TPROXY) {
+#ifdef TRANS_TPROXY
+  if (get_options()->TransProxyType_parsed == TPT_TPROXY) {
     if (getsockname(ENTRY_TO_CONN(conn)->s, (struct sockaddr*)&orig_dst,
                     &orig_dst_len) < 0) {
       int e = tor_socket_errno(ENTRY_TO_CONN(conn)->s);