mandiant / sunburst_countermeasures

BSD 2-Clause "Simplified" License
560 stars 199 forks source link

Update fnv1a_xor_hashes.txt #23

Closed ruppde closed 3 years ago

ruppde commented 3 years ago

add 13852439084267373191 : keep-alive 7574774749059321801 : user-agent 15514036435533858158 : if-modified-since

ruppde commented 3 years ago

@jhsmith sorry, I don't get this. if someone sends non-conflicting PRs, why don't you just 1-click-merge them?

I sent #17, you close it, say you put it in #18, but it wasn't there, so after asking you put it in #19 I send #23, you take 2 out of the 3 hashes, put them in #26 and leave #23 open

is there anything wrong with 15514036435533858158 : if-modified-since ?

jhsmith commented 3 years ago

Apologies - I missed this PR - it's been a busy week. For your question about "take 2 out of the 3 hashes, put them in #26" -> those were submitted out of band to us, not through GitHub. Feel free to resolve the conflict & i'll accept the remaining ones. Appreciate the support.

ruppde commented 3 years ago

now done in the other PRs