[tor-commits] [bridgedb/master] Merge branch 'fix/1606-based-on_bug1606_spec_update_rebased_r1' into develop

[isis at torproject.org]

commit 47b6a88d2469a1f18e634312a300768612c44864
Merge: 8fd5e5c 7d03f33
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Dec 13 07:45:25 2013 +0000

    Merge branch 'fix/1606-based-on_bug1606_spec_update_rebased_r1' into develop

 bridge-db-spec.txt                         |  281 --------------------
 doc/bridge-db-spec.txt                     |  391 ++++++++++++++++++++++++++++
 doc/proposals/XXX-bridgedb-learns-ipv6.txt |  280 ++++++++++++++++++++
 lib/bridgedb/Main.py                       |    4 +
 xxx-bridgedb-learns-ipv6.txt               |  280 --------------------
 5 files changed, 675 insertions(+), 561 deletions(-)