diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:29:25 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:29:25 +0100 |
| commit | 6ae9769b29330815c6c094ef43bafd6fa13b7626 (patch) | |
| tree | 237c43b67fea8912e5e59eda29bf399a1ce107d5 | |
| parent | 55e1fe874de322a280dd8e2dfb92407360aad14e (diff) | |
| parent | a726cd76df0205d573ce0a641b65a89c5f1ce3b4 (diff) | |
| download | tor-6ae9769b29330815c6c094ef43bafd6fa13b7626.tar.gz tor-6ae9769b29330815c6c094ef43bafd6fa13b7626.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
| -rw-r--r-- | changes/bug15064 | 4 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug15064 b/changes/bug15064 new file mode 100644 index 0000000000..e6bd747b1f --- /dev/null +++ b/changes/bug15064 @@ -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. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index e6dfc634e9..2a1a2f0fd2 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -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; |