See ticket27686_034 for the branch. It's based on Mikeperry's ticket25573-034, and merges cleanly into master. There's a compilation issue post-merge, so I made ticket27686_035 to clean that up. See PR at https://github.com/torproject/tor/pull/335 . No changes file needed if we get this in before 0.3.5.1 :)