[tor-commits] [tor/maint-0.2.5] changes file for 12474, 12438.