[tor-commits] [manual/master] Merge branch 'android-docs-rewording'