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