Merge branch 'master' into python-3.5-support-removal

author Harmon <Harmon758@gmail.com>

Mon, 28 Dec 2020 13:12:49 +0000 (07:12 -0600)

committer GitHub <noreply@github.com>

Mon, 28 Dec 2020 13:12:49 +0000 (07:12 -0600)
author Harmon <Harmon758@gmail.com>
Mon, 28 Dec 2020 13:12:49 +0000 (07:12 -0600)
committer GitHub <noreply@github.com>
Mon, 28 Dec 2020 13:12:49 +0000 (07:12 -0600)
diff --cc tests/test_streaming.py
Simple merge
diff --cc tweepy/streaming.py
Simple merge
author	Harmon <Harmon758@gmail.com>
	Mon, 28 Dec 2020 13:12:49 +0000 (07:12 -0600)
committer	GitHub <noreply@github.com>
	Mon, 28 Dec 2020 13:12:49 +0000 (07:12 -0600)
		1	2
tests/test_streaming.py	patch \|	diff1 \|	diff2 \|	blob \| history
tweepy/streaming.py	patch \|	diff1 \|	diff2 \|	blob \| history