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