[tor-commits] [lego/master] Merge branch 'navbar_strings'