[tor-commits] [globe/master] Merge branch 'trac-16835'

[isis at torproject.org]

commit 9673022b2ac59c9e9a3273abfa688ef998dac8a2
Merge: 37d0a57 a586db5
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Aug 20 08:47:27 2015 +0000

    Merge branch 'trac-16835'

 src/js/templates/bridgeDetail.hbs |    6 ++++--
 src/js/templates/relayDetail.hbs  |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)