commit a06688478f76fb1bcc6e5a0f4d4aa41720bc8eb0 Merge: cdc0ffa 6f0f536 Author: Isis Lovecruft <isis@torproject.org> Date: Sat Mar 21 02:00:52 2015 +0000 Merge branch 'master' into develop