[tor-commits] [tor/master] Merge branch 'bug13295_v2_025' into maint-0.2.5