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