[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'cohoshgl/snowflake-fastly'

[sysrqb at torproject.org]

commit 663a42c51fde05d7f0ee26e01c408a86f863622c
Merge: 3ebc8ce b7bd888
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Mon Apr 5 19:34:44 2021 +0000

    Merge remote-tracking branch 'cohoshgl/snowflake-fastly'

 .../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 +-
 4 files changed, 4 insertions(+), 4 deletions(-)