[tbb-commits] [torbutton/master] Merge remote-tracking branch 'arthur/13882+'

[mikeperry at torproject.org]

commit 3692388e5262cd6a5b9ffcd1a950b04e56933e18
Merge: 7fd169e de8cb7a
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Feb 18 11:41:32 2015 -0800

    Merge remote-tracking branch 'arthur/13882+'

 src/chrome/content/tor-circuit-display.js |   71 ++++++++++-------------
 src/modules/tor-control-port.js           |   88 ++++++++++++++++++++++-------
 2 files changed, 99 insertions(+), 60 deletions(-)