[tor-commits] [tor/maint-0.2.8] Merge branch 'doc18312' into maint-0.2.8