[tor-commits] [user-manual/master] Merge remote-tracking branch 'arthur/20739+2'