commit be58b8f8a70b3e1e4f3cd6d3e10b6fe2a82a7998 Merge: e6e7ea1 d84d884 Author: Isis Lovecruft isis@torproject.org Date: Wed May 6 20:03:28 2015 +0000

Merge remote-tracking branch 'rr/2015-04-30-01-misc-fixes' into develop

lib/bridgedb/bridges.py | 2 +- lib/bridgedb/parse/descriptors.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)