[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/moar-libs'