commit b52786f8abef76423e89e3ef74e1714490bf0b97
Merge: 336eb62 11b83c6
Author: Isis Lovecruft <[email protected]>
Date: Fri Jan 24 21:00:35 2014 +0000
Merge branch 'feature/10724-collect-timestamps-option' into develop
bridgedb.conf | 18 ++++++++++++++++++
lib/bridgedb/Main.py | 21 +++++++++++----------
2 files changed, 29 insertions(+), 10 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
