commit 00228a8c3561fa4da0de5501259e7ed7ed7f6615 Merge: f2ecd0d 124db86 Author: Isis Lovecruft <isis@torproject.org> Date: Tue Feb 4 00:04:23 2014 +0000 Merge branch 'fix/9988-rm-hashlibnew' into develop lib/bridgedb/Storage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)