[tor-commits] [torspec/master] Merge remote-tracking branch 'bridgedb/bdb-spec' into bridgedb/1606-bridgedb-spec

[nickm at torproject.org]

commit 44876cd32c55c8a59649c68414e205624bb0468b
Merge: 2cb5c4c 38d3292
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Jan 30 16:51:09 2014 +0000

    Merge remote-tracking branch 'bridgedb/bdb-spec' into bridgedb/1606-bridgedb-spec

 bridgedb-spec.txt |  391 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 391 insertions(+)