commit ef23e342a458cc00d7c797baec632db893203a1e Merge: 270eed4 dcbd978 Author: Mike Perry mikeperry-git@torproject.org Date: Tue Mar 24 22:05:23 2015 -0700

Merge remote-tracking branch 'arthur/13019' into bug13019

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