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

6 Jun 2014


      commit bb948f9e376d52a1917d3c3d43dffc4468f32f1b
Merge: 136ff6c cb8b01b
Author: Isis Lovecruft <isis@torproject.org>
Date:   Fri Jun 6 23:38:08 2014 +0000

    Merge branch 'master' into develop

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

isis＠torproject.org