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

30 Jul 2014


      commit 1ed4585488eee4fd3fe62e27cd24069d609fcec2
Merge: 2a6d546 c15167a
Author: Isis Lovecruft <isis@torproject.org>
Date:   Tue Jul 29 01:24:02 2014 +0000

    Merge branch 'master' into develop

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

isis＠torproject.org