commit a619387402ecc355980bdee035c5f4d043e83799 Merge: 7e03040 fc9fcd6 Author: Isis Lovecruft isis@torproject.org Date: Fri Jan 31 13:00:35 2014 +0000

Merge branch 'fix/9988-apply-patch' into develop

lib/bridgedb/Bridges.py | 4 ++-- lib/bridgedb/Storage.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)