commit d151a069e9a35788874d8aead3e6720a8924e9b5 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 23 10:53:40 2014 -0500

tweak whitespace; log bad socket family if bug occurs --- src/common/sandbox.c | 1 - src/or/connection_edge.c | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 82117cb..b1c2a09 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -68,7 +68,6 @@ #include <linux/netfilter_ipv6/ip6_tables.h> #endif

- #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \ defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION) #define USE_BACKTRACE diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 09645d0..5ab9af5 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -59,7 +59,6 @@ #define TRANS_NETFILTER_IPV6 #endif

- #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H) #include <net/if.h> #include <net/pfvar.h> @@ -1430,7 +1429,9 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req) break; #endif default: - log_warn(LD_BUG, "Received transparent data from an unsuported socket family."); + log_warn(LD_BUG, + "Received transparent data from an unsuported socket family %d", + ENTRY_TO_CONN(conn)->socket_family); return -1; } if (rv < 0) {