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

[isis at torproject.org]

commit e059d91887da0e35a78c38d6f093d8c359dba90d
Merge: abece06 ac80d7d
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Jul 25 19:24:23 2015 +0000

    Merge branch 'master' into develop