diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-12 12:27:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-12 12:27:25 -0400 |
| commit | eecd410984e3f1741dda877fe482e082a41db700 (patch) | |
| tree | ef0d1c8e82d739e81a3f0e528115b9b5fb319d81 /src/or | |
| parent | a00d07ac1bddd84dd6109cae7afda970d5722d24 (diff) | |
| parent | 24c031b1a28658c921a746f4d58f3ca5e9994108 (diff) | |
| download | tor-eecd410984e3f1741dda877fe482e082a41db700.tar.gz tor-eecd410984e3f1741dda877fe482e082a41db700.zip | |
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection_edge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 49f9ba4978..1eeb22fcef 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1531,7 +1531,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; |