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