[tor-commits] [bridgedb/develop] Merge branch 'feature/7520-social-dist-design_r1' into develop

[isis at torproject.org]

commit 6384d7b4e33ffa0a8e0339f19571da5fb5b06778
Merge: aa495a9 38cbe89
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Jan 29 21:00:55 2014 +0000

    Merge branch 'feature/7520-social-dist-design_r1' into develop

 .../XXX-bridgedb-database-improvements.txt         |  260 ++++++++++
 doc/proposals/XXX-bridgedb-social-distribution.txt |  496 ++++++++++++++++++++
 2 files changed, 756 insertions(+)