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

[isis at torproject.org]

commit bac9d9ccac303180607ab07875ddbfc3d88b7c85
Merge: 8b0cabf c51090f
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Mar 21 05:37:26 2015 +0000

    Merge branch 'fix/9380-stem_r10' into develop

 lib/bridgedb/parse/descriptors.py |    2 --
 1 file changed, 2 deletions(-)