[tor-commits] [community/master] Merge branch 'i_226'