meejah Merge branch '3155' of github.com:meejah/tor into 3155