[tor-commits] [arm/master] Merging to release for version 1.4.0