commit 6fe6c6538b0284b70e78c2df2f0c289c6f93a792 Merge: b0f56a6 f848aa9 Author: Isis Lovecruft <isis@torproject.org> Date: Fri May 16 18:48:38 2014 +0000 Merge branch 'master' into develop