[tor-commits] [bridgedb/master] Merge branch 'translations/2015-03-20-update' into develop