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