It's funny that the PR wasn't really that difficult, but to get there.. boy...

All credit goes to the Tor lib that got this far.