[tor-commits] [bridgedb/master] Merge branch 'translations/2014-06-06-update' into develop