Merge branch 'update_obfsvpn' into 'master'

app/src/main/java/de/blinkt/openvpn/VpnProfile.java

app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java

app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java

...in/java/de/blinkt/openvpn/core/connection/Connection.java

...va/de/blinkt/openvpn/core/connection/Obfs4Connection.java

...de/blinkt/openvpn/core/connection/Obfs4HopConnection.java

...ain/java/se/leap/bitmaskclient/base/models/Constants.java

...main/java/se/leap/bitmaskclient/base/models/Provider.java

...ain/java/se/leap/bitmaskclient/base/models/Transport.java

...a/se/leap/bitmaskclient/base/utils/InputStreamHelper.java

app/src/main/java/se/leap/bitmaskclient/eip/EIP.java

app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java

.../main/java/se/leap/bitmaskclient/eip/GatewaySelector.java

.../main/java/se/leap/bitmaskclient/eip/GatewaysManager.java

...in/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java

...leap/bitmaskclient/pluggableTransports/HoppingConfig.java

...tmaskclient/pluggableTransports/HoppingObfsVpnClient.java

.../leap/bitmaskclient/pluggableTransports/Obfs4Options.java

...leap/bitmaskclient/pluggableTransports/ObfsVpnClient.java

...ap/bitmaskclient/pluggableTransports/PtClientBuilder.java