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

[phw at torproject.org]

commit 8e7c77a6c1455793e2a127a4214d739b313f88e6
Merge: bd8b379 886f396
Author: Philipp Winter <phw at torproject.org>
Date:   Wed Jul 15 21:35:47 2020 +0000

    Merge branch 'master' into 'develop'
    
    Update bridgedb-metrics spec to align with version 2 of the metrics format and...
    
    See merge request tpo/anti-censorship/bridgedb!9

 doc/bridgedb-metrics-spec.txt | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)