See also Tor's outstanding patch: http://bugs.freedesktop.org/show_bug.cgi?id=16788 Is any of that work in your tree?