[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8