[tor-commits] [torbirdy/develop] Merge pull request #32 from arthuredelstein/6314+1