[tor-commits] [tpo/staging] fix #20 and more