commit c995f6217a93e2927d049a578262670a6763c6b7 Merge: 2cb5c4c 4aee321 Author: Isis Lovecruft <isis@torproject.org> Date: Thu Jan 30 16:33:57 2014 +0000 Merge branch 'db-spec_1' into bridgedb-database-improvements_1 proposals/XXX-bridgedb-database-improvements.txt | 260 ++++++++++++++++++++++ 1 file changed, 260 insertions(+)