commit e2de6afb4332452664b8ff7dbc707c3384ae7bf6
Merge: 625cbe8 c053bff
Author: Isis Lovecruft <i...@torproject.org>
Date: Wed May 28 21:18:43 2014 +0000
Merge branch 'hotfix/0.2.1-docstrings' into develop
bridgedb.conf | 2 +-
lib/bridgedb/email/server.py | 86 ++++++++++++++++++++++++++----------------
2 files changed, 55 insertions(+), 33 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
