commit 63d56a8142b7dba4eb4eec3da8f3d40a67d1cf59 Merge: b4f20eb a580c4b Author: Isis Lovecruft <isis@torproject.org> Date: Wed Aug 27 06:40:22 2014 +0000 Merge commit 'a580c4ba0d30f55546d3d181d7ea878e6a13133c' into develop