diff options
| author | Peter Palfrader <peter@palfrader.org> | 2009-11-13 19:58:59 +0100 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2009-11-13 19:58:59 +0100 |
| commit | 4db6e63c263591d3bea58c018446cecb321e2b64 (patch) | |
| tree | b55ba6e190fb9ad2584224f1a27310c3d0cd824b /contrib/polipo | |
| parent | 58ccdfccefb467fe453ec65e1cea90a6e7f729af (diff) | |
| parent | 751e9b2bb64f5c4f5af6e3c9105c85deae17943e (diff) | |
| download | tor-4db6e63c263591d3bea58c018446cecb321e2b64.tar.gz tor-4db6e63c263591d3bea58c018446cecb321e2b64.zip | |
Merge branch 'debian-merge' into debian-0.2.1
* debian-merge: (37 commits)
New upstream version
bump to 0.2.1.20
Move moria1 and Tonga to alternate IP addresses.
read the "circwindow" parameter from the consensus
Code to parse and access network parameters.
Revert "Teach connection_ap_can_use_exit about Exclude*Nodes"
Work around a memory leak in openssl 0.9.8g (and maybe others)
Teach connection_ap_can_use_exit about Exclude*Nodes
make some bug 1090 warnings go away
Fix a memory leak when parsing a ns
Fix obscure 64-bit big-endian hidserv bug
turns out the packaging changes aren't in 0.2.1.20
update changelog with bundle details
Use an _actual_ fix for the byte-reverse warning.
Use a simpler fix for the byte-reversing warning
Fix compile warnings on Snow Leopard
Add getinfo accepted-server-descriptor. Clean spec.
Reduce log level for bug case that we now know really exists.
Only send reachability status events on overall success/failure
update the README instructions and OS X makefiles
...
Diffstat (limited to 'contrib/polipo')
| -rw-r--r-- | contrib/polipo/Makefile.osx | 10 | ||||
| -rw-r--r-- | contrib/polipo/README | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/contrib/polipo/Makefile.osx b/contrib/polipo/Makefile.osx index 8e748e2adb..55ed1c62f8 100644 --- a/contrib/polipo/Makefile.osx +++ b/contrib/polipo/Makefile.osx @@ -30,9 +30,13 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \ DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) -UNIVERSAL = -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) $(UNIVERSAL) +# Uncomment the UNIVERSAL, LDFLAGS, CFLAGS lines if you want universal binaries, otherwise +# you'll produce a binary only for your architecture and version of OSX +# UNIVERSAL = -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc +# LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk +# CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) $(UNIVERSAL) +# If you uncommented the above CFLAGS, remove this next one. +CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \ config.c local.c http.c client.c server.c auth.c tunnel.c \ diff --git a/contrib/polipo/README b/contrib/polipo/README index 038e354413..e05ab0ceec 100644 --- a/contrib/polipo/README +++ b/contrib/polipo/README @@ -1,4 +1,6 @@ Copyright 2007-2008 Andrew Lewman +Copyright 2009 The Tor Project + ---------------- General Comments ---------------- |