[tor-commits] [sbws/master] Merge branch 'bug_40082' into 'maint-1.1'

[juga at torproject.org]

commit 36d96da7c36b6c02751eb7697b17d78cdea8f2e6
Merge: 37d5c0a 664742c
Author: juga <juga at riseup.net>
Date:   Mon Mar 22 16:30:43 2021 +0000

    Merge branch 'bug_40082' into 'maint-1.1'
    
    fix: doc: Clarify Torflow aggregation
    
    Closes #40082
    
    See merge request tpo/network-health/sbws!80

 docs/source/torflow_aggr.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)