[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

[isis at torproject.org]

commit 5912b3ca830b238e56d6e2a78fe359024379596d
Merge: 9ec5a96 3a1aa0d
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Mar 25 19:02:12 2015 +0000

    Merge branch 'master' into develop