torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug15064_025' into maint-0.2.6

Browse Source
This commit is contained in:
Nick Mathewson
2015-03-04 12:26:43 +01:00
parent c5c4ea2db0 681802817d
commit a726cd76df
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug15064
+4
View File
@@ -0,0 +1,4 @@
o Major bugfixes (FreeBSD IPFW transparent proxy):
- Fix address detection with FreeBSD transparent proxies,
when "TransProxyType ipfw" is in use.
Fixes bug 15064; bugfix on 0.2.5.4-alpha.
src/or/connection_edge.c
+2 -1
View File
@@ -1763,7 +1763,8 @@ connection_ap_get_original_destination(entry_connection_t *conn,
if (options->TransProxyType_parsed == TPT_PF_DIVERT)
return destination_from_socket(conn, req);
if (options->TransProxyType_parsed == TPT_DEFAULT)
if (options->TransProxyType_parsed == TPT_DEFAULT ||
options->TransProxyType_parsed == TPT_IPFW)
return destination_from_pf(conn, req);
(void)conn;