[tor-commits] [onionoo/master] Add two, remove one manual 'A1' substitution.