[tor-commits] [tor-launcher/master] Merge remote-tracking branch 'brade/bug11879-02'

[mikeperry at torproject.org]

commit 2d7e66fa39cf3e9da4242e17171ff02cf14bcf9a
Merge: fd61cb0 81fd61c
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Apr 16 18:57:54 2015 -0700

    Merge remote-tracking branch 'brade/bug11879-02'

 src/chrome/content/progress.js |   29 ++++++++++++++++++++++++++++-
 src/components/tl-process.js   |    1 +
 src/components/tl-protocol.js  |    4 +++-
 3 files changed, 32 insertions(+), 2 deletions(-)