[tor-commits] [bridgedb/develop] Merge branch 'issue-33647' into 'develop'

[phw at torproject.org]

commit 95ee763cd5cb7761dd639b388541661c93e690d0
Merge: fb3cfa7 04fd047
Author: Philipp Winter <phw at torproject.org>
Date:   Tue Jul 14 01:55:53 2020 +0000

    Merge branch 'issue-33647' into 'develop'
    
    Issue 33647
    
    See merge request tpo/anti-censorship/bridgedb!5

 .pylintrc  | 2 +-
 CHANGELOG  | 3 +++
 README.rst | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)