tomrittervg Merge branch 'doubleit' of bwauth:~/torflow into doubleit