[tor-commits] [torbirdy/master] Merge pull request #26 from arthuredelstein/6314