[tor-commits] [tor/maint-0.2.5] Merge branch 'trove-2017-009_025' into maint-0.2.5