[tor-commits] [torbrowser/maint-2.2] make osx build options backwards compatible (closes: #3671) and grab all of the right patches when building firefox