[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40188_v2'

[sysrqb at torproject.org]

commit 79f54e66f8f2d181276a5b8e39867edde7dcbbb4
Merge: 47ab0aa a933946
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue Jan 26 23:40:39 2021 +0000

    Merge remote-tracking branch 'gkgl/bug_40188_v2'

 ...01-Revert-Bug-30318-Add-snowflake-support.patch | 78 ++++++++++++++++++++++
 projects/tor-android-service/build                 |  4 +-
 projects/tor-android-service/config                |  2 +
 projects/tor-onion-proxy-library/build             | 29 +++++---
 projects/tor-onion-proxy-library/config            |  5 ++
 5 files changed, 108 insertions(+), 10 deletions(-)