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

21 Feb 2014


      commit befe5d49c53c2c3eff3c1a46535cbc834b6db329
Merge: e5bc105 e2f859c
Author: Isis Lovecruft <isis@torproject.org>
Date:   Fri Feb 21 23:28:27 2014 +0000

    Merge branch 'master' into develop

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

isis＠torproject.org