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

[ioerror at torproject.org]

commit d49d6f98acddb7d0223b61541653e9c1596e73c5
Merge: 81f5058 2542b53
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Sun Jan 27 13:12:42 2013 -0800

    Merge branch 'torsocks_on' into pending-changes

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