[tor-commits] [torsocks/master] Merge branch 'libdir' into pending-changes

[ioerror at torproject.org]

commit 5441e526b111eb60ba6fe30d319d51a3c09f38f6
Merge: e8b9696 1699610
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Tue Nov 6 20:13:17 2012 -0800

    Merge branch 'libdir' into pending-changes

 src/torsocks.in |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)