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

5 Feb 2014


      commit 44be20d6fbb5578b00ef58ec6340ea72f8aaea86
Merge: 00228a8 3ee91c1
Author: Isis Lovecruft <isis@torproject.org>
Date:   Tue Feb 4 00:29:33 2014 +0000

    Merge branch 'master' into develop

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

isis＠torproject.org