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

[ioerror at torproject.org]

commit 6f73cd7d0197e73c519dfc56c4dae605777bd157
Merge: e39ac68 014e854
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Sat Jan 26 19:37:41 2013 -0800

    Merge branch 'license-update' into pending-changes

 COPYING |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)