Merge branch 'maintenance' into develop

Author: Sebastian Wagner

.travis.yml

@@ -17,6 +17,9 @@ jobs:
     env: mode=codestyle
   - python: 3.8
     env: mode=documentation
+  exclude:
+  - python: 3.5
+    env: requirements=true
 before_install:
   - if [[ -v requirements ]]; then curl -s -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.6.1-amd64.deb; fi
   - if [[ -v requirements ]]; then sudo dpkg -i --force-confnew elasticsearch-7.6.1-amd64.deb; fi

CHANGELOG.md

@@ -141,7 +141,9 @@ CHANGELOG
 - `intelmq.bots.parsers.microsoft.parser_ctip`:
   - Fix mapping of `DestinationIpInfo.DestinationIpConnectionType` field (contained a typo).
   - Explicitly ignore field `DestinationIpInfo.DestinationIpv4Int` as the data is already in another field.
-- `intelmq.bots.parsers.generic.parser_csv`: Ignore line having spaces or tabs only or comment having leading tabs or spaces (PR#1669 by Brajneesh).
+- `intelmq.bots.parsers.generic.parser_csv`:
+  - Ignore line having spaces or tabs only or comment having leading tabs or spaces (PR#1669 by Brajneesh).
+  - Data fields containing `-` are now ignored and do not raise an exeception anymore (#1651, PR#74 by Sebastian Waldbauer).
 
 #### Experts
 
@@ -152,6 +154,7 @@ CHANGELOG
 ### Packaging
 
 ### Tests
+- Travis: Deactivate tests with optional requirements on Python 3.5, as the build fails because of abusix/querycontacts version conflicts on dnspython.
 
 ### Tools