[tor-commits] [tor/master] Fold ticket40314 into ChangeLog.