[tor-commits] [tor/master] Rewrite 18859 changes file from user POV.