[tor-commits] [torsocks/master] fixup merge conflict

[ioerror at torproject.org]

commit 1ca52167375bb241db1c76dff882976d23c04009
Merge: 6f73cd7 2e112bf
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Sat Jan 26 20:01:07 2013 -0800

    fixup merge conflict

 ChangeLog             |    7 +++++++
 src/common.h          |   28 ++++++++++++++++++++++++++++
 src/darwin_warts.c    |   16 ++++------------
 src/expansion_table.h |    5 -----
 src/torsocks.c        |   45 ++++++++++++++++++---------------------------
 5 files changed, 57 insertions(+), 44 deletions(-)

diff --cc ChangeLog
index 79150c5,6578a4a..e64d10f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,12 +1,33 @@@
  Torsocks 1.3
 -2012-xx-xx Unknown
 +XXX XXX
 +
 +    o Issue 47: Invocation without argument is broken
 +
 +      Added '--shell' as the documented way to spawn a shell with torsocks
 +      This removes the never working documented case where torsocks without
 +      arguments was supposed to spawn a shell.
 +      
 +    o Issue 48: Typos in manpage
 +      
 +      Updated man page to fix typos. 
 +      
 +    o Issue 37: Torsocks lets through tcp6 connections to tcp4 hosts
 +
 +      Explicitly fail closed on connect() calls of AF_INET6 type
 +      Set errno to EAFNOSUPPORT in the IPv6 case.
 +
 +    o Issue 33: LIBDIR hardcoded to /usr/lib, s/b/ /usr/lib64 on x86_64
 +
 +      We now look for torsocks in /usr/lib and then /usr/lib64
 +      We assume that the first found is the correct one.
 +
+     o Issue 3: "... not found in any shared library. ..."
+       
+       This issue is extensively covered in the following bug report:
+       http://code.google.com/p/torsocks/issues/detail?id=3
+       
+       Fixes provided by Lunar, Anthony Basile and Matthew Finkel
+ 
  Torsocks 1.2
  2011-10-28 Robert Hogan <robert at roberthogan.net>