[tor-commits] [onionoo/master] Fix possible NPE and make tests pass again.