commit a3d3114747cf8f758f7b650b141f4fdbdd10868f Merge: bdf2289 d8dfd2f Author: Mike Perry mikeperry-git@torproject.org Date: Wed Jun 24 20:13:49 2015 -0700

Merge remote-tracking branch 'arthur/16357'

src/chrome/content/torbutton.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)