commit e645344de84fdb0f7d438aa3a34d3406742a7310 Merge: 44876cd c995f62 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 30 16:00:12 2014 -0500

Merge remote-tracking branch 'isis/bridgedb-database-improvements_1'

proposals/XXX-bridgedb-database-improvements.txt | 260 ++++++++++++++++++++++ 1 file changed, 260 insertions(+)