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 branch 'maint-0.2.7'

Browse Source
This commit is contained in:
Nick Mathewson
2015-11-25 09:28:44 -05:00
parent fe8eb9b366 232ccc18c4
commit 62aad9c0b6
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug17551
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes (compilation):
- When checking for net/pfvar.h, include netinet/in.h if possible.
This fixes transparent proxy detection on OpenBSD. Fixes bug
17551; bugfix on 0.1.2.1-alpha. Patch from "rubiate".
configure.ac
+3
View File
@@ -967,6 +967,9 @@ AC_CHECK_HEADERS(net/pfvar.h, net_pfvar_found=1, net_pfvar_found=0,
#endif
#ifdef HAVE_NET_IF_H
#include <net/if.h>
#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif])
AC_CHECK_HEADERS(linux/if.h,[],[],