[tor-commits] [bridgedb/develop] Merge remote-tracking branch 'rr/2015-04-30-01-misc-fixes' into develop