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

[isis at torproject.org]

commit eb5abdcb75e94f87013a8a865a3f5978dd30c660
Merge: 24dc8dc f266f32
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Mar 26 05:46:59 2014 +0000

    Merge branch 'master' into develop