commit 0dab1bc8127a9bfa860bec24490ab54401b96afb Merge: cedc651 c26e310 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Jul 28 14:38:52 2015 -0400 Merge remote-tracking branch 'linus/bug_11061'