* 1.1.8 was built by F-Droid, but from an outdated 3 month
  old tag which ended up on gitlab accidentailly (likely
  when trying to figure out build issues)
* As such, it doesn't have the new IP and cert, and also
  has old resources
* Retag and rebuild to get it all working

Change-Id: I111fc2e6ecafb018a29aa0cd8647e4de2c085da3

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
Change-Id: I4adf59bd9be89dbc0206f6127306225bb1f9ee98

# By cyBerta (227) and others
# Via cyberta (62) and others
* 'master' of https://0xacab.org/leap/bitmask_android: (301 commits)
  Updated README.md
  don't build openvpn3, openssl speed test and rsapss
  fix tests using mocked okhttpclient
  update DoH DNS Servers for API communication
  always try the complementary DNS resolution strategy if the primary one failed
  try tls 1.3 during bootstrapping
  draft DoH for bootstrapping
  update okhttp
  update bitmaskcore - improve build steps
  update bitmaskcore - update to latest obfsvpn
  only take experimental transports into consideration in case the user switched the experimental transport toggle
  fix missing domain name of manually added providers in provider selection
  adding tests
  add required extra options for obfs4-hop pt
  improve sanity check for obfs4 pts defined in eip-service.json
  Assume port hopping only in case of a missing endpoints json for obfs4-hop. The gateway IP and the cert json field in options substitute the missing endpoints json
  set correct proxy port for obfs4-hop pt proxy
  obfs4-hop enum value - improve handling of disallowed dashes in enums
  fix sanity checks for the case of decoupled bridges
  update bitmaskcore, obfsvpn
  ...

# Conflicts:
#	app/build.gradle
#	app/src/custom/assets/calyx.net.json
#	app/src/custom/res/drawable-ldpi/logo.png
#	app/src/custom/res/drawable-mdpi/logo.png

Change-Id: Icbfcc5d0758520e985497823e0d76cb846305382

Change-Id: I598675726ad7c414308df7fca788cbe472edff0a
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Ram <airavatam@tutanota.com>
Co-authored-by: Tsz Wai LAM <twlam707@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/hr/
Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ml/
Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/zh_Hant_HK/
Translation: CalyxOS/CalyxVPN

Change-Id: I060c7553d11eef7c12d4394e2e848cf17c3a5631

* For the old infra, previous cert expired
* SHA256 fingerprint 4bba0f918fa4be8ec4dde420b7d0ba98a351c1f5866d783d377c6bac40fd187a
* New infra cert untouched
* Same as I3c85c3758ce1d78b8253b0b1191b28d567d99390

Change-Id: I9b360fefc48f2721240d4f8bd3d6f92837fbe557

* For the old infra, previous cert expired
* SHA256 fingerprint 4bba0f918fa4be8ec4dde420b7d0ba98a351c1f5866d783d377c6bac40fd187a
* New infra cert untouched

Change-Id: I3c85c3758ce1d78b8253b0b1191b28d567d99390

Change-Id: Iff7e973a2ea7546ebede4b98a1d510f2e7b75c42

don't build openvpn3, openssl speed test and rsapss

See merge request !246

Updated README.md

See merge request !247

DoH

See merge request !239

Update obfsvpn

See merge request !243

only take experimental transports into consideration in case the user switched the experimental transport toggle

Assume port hopping only in case of a missing endpoints json for obfs4-hop. The gateway IP and the cert json field in options substitute the missing endpoints json

don't handle obfs4 over kcp as a separate pluggable transport, instead 'tcp' and 'kcp' become valid protocols for obfs4

improve fastlane

See merge request !244