[tor-commits] [tor/release-0.2.5] Sort the 0257 changelog entries by section; combine two.