commit 55d3976e8dbfe7e0d969faf50722e6b0e5f869ac Merge: 430ccaa 1f44365 Author: Mike Perry mikeperry-git@torproject.org Date: Fri Mar 20 14:21:54 2015 -0700

Merge remote-tracking branch 'mikeperry/bug13650'

src/chrome/content/torbutton.js | 12 ++++++++---- src/defaults/preferences/preferences.js | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-)