[tor-commits] [tor/master] Fix a bug in earlier torcert fix, fix another.