[tor-commits] [globe/master] Merge remote-tracking branch 'leivaburto/task-16962'

commit 6b13846efbef46ed2736ef06a57abff3fdf1fda5 Merge: 9673022 9815a16 Author: Isis Lovecruft isis@torproject.org Date: Fri Jan 8 21:19:23 2016 +0000

Merge remote-tracking branch 'leivaburto/task-16962'

src/css/new-style.css | 4 ++++ src/js/models/OnionooDetail.js | 8 ++++++++ src/js/models/defaults.js | 7 ++++--- src/js/templates/relayDetail.hbs | 13 +++++++++---- test/unit/onionoodetail.test.js | 3 ++- 5 files changed, 27 insertions(+), 8 deletions(-)