commit de185dd7b4e5188905ed972496e69dd537bd0534 Merge: eeb2153 251a6f7 Author: Georg Koppen gk@torproject.org Date: Fri Aug 7 18:27:14 2020 +0000

Merge remote-tracking branch 'gitlab/merge-requests/11' into master

projects/pion-stun/config | 2 +- projects/snowflake/config | 2 +- .../tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +- .../tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- .../tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)