Your chances of being involved in a terrorist attack are lower than your chances of being struck by lightening, and here in the U.S., most of the shooting attacks have been one shooter and even overseas they have only been 2 or 3 shooters at a time and they have not been infantry squad or larger attacks (so any gun/tactics you have for self defense that would serve 1-3 attackers should be acceptable for a possible terrorist shooter as well). As for the chances of the domestic protests endangering you or me, as it stands now I don't see that being very likely (though if you are a police officer that equation may be a little different). Should some in your city turn into full scale riots, you want to be ready for a riot so preferably get home as fast as possible and have something more than a handgun for defense (a shotgun or a .223/5.56 carbine).
That said, because it seems that home invasions and multiple attackers outside the home, while still far less common than a single attacker, are far more common than they used to be, I have changed up the kinds of guns I carry. When in a state where I can carry (not my home state unfortunately) I used to carry a 5-shot snub or a small auto (micro-9 or a Ruger LCP). I am selling my LCP, most of my small snubs, and my Kel Tec Pf-9. The only small auto I'm keeping is my SIG P290RS (mainly because I love that gun), but it will only see very occasional use, mostly as an occasional backup (and theoretically should I ever be in a situation where I simply can not conceal the larger gun). I am moving to primarily true compact guns for carry and currently have a .45ACP SIG P250 Compact (9+1 capacity) and have just bought a CZ P01 (14+1 capacity) for that purpose. I do still occasionally carry a 6 shot revolver, but no longer a 5 shot or 2" .38+P, the minimum is a 3" barrel (better ballistics and sight radius) and 6 rounds of .45LC, .44spl/mag (I don't have one yet), or .357mag.
When at home in MD where a CCW is nearly impossible to come by (and when out of state in order to have options for different situations) I have stepped things up. Long ago, I used to EDC a knife, but when I had jobs where I couldn't carry (as a teacher, it is against federal law for me to bring a knife to school) I stopped. Now, I try hard to remember to drop a knife in my pocket on weekends and evenings, and I even keep one in one of my vehicle's storage bins so I can have one for defense on my way to and from work. Also, in addition to a keychain container of pepper spray, I now carry a larger can of pepper spray gel on a belt holster when wearing clothes in which I can conceal it.