[tor-commits] [torbutton/master] Merge remote-tracking branch 'arthur/14937+7'

[gk at torproject.org]

commit 5ac0bb12aaceb954d124e1e65cd47c37e28fcaa7
Merge: 55d3976 c632162
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Mar 24 15:41:45 2015 +0000

    Merge remote-tracking branch 'arthur/14937+7'

 src/chrome/content/tor-circuit-display.js |   37 ++++++++++++++++-------------
 src/modules/tor-control-port.js           |    4 +---
 2 files changed, 21 insertions(+), 20 deletions(-)