[tor-commits] [community/develop] Merge remote-tracking branch 'nick/master'

[emmapeel at torproject.org]

commit 80c7169ad5bfa08b45e27a2c5bdf3f92d2cc5bb3
Merge: 315fcc6 fd08625
Author: Philipp Winter <phw at nymity.ch>
Date:   Tue Sep 17 09:13:06 2019 -0700

    Merge remote-tracking branch 'nick/master'

 .../technical-setup/bridge/openbsd/contents.lr           | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)