[tor-commits] [community/develop] Merge branch 'aadibajpai'