[tor-commits] [community/staging] Merge branch 'bridge-note'

[hiro at torproject.org]

commit 89c10bb921b0d102e2a6fc72e2698c08cd7dc62b
Merge: 1882f3e 286bf68
Author: gus <gus at torproject.org>
Date:   Thu Oct 29 10:09:47 2020 -0400

    Merge branch 'bridge-note'

 content/relay-operations/technical-setup/bridge/contents.lr | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)