<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "Menlo"), DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: 0.875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px;
}
body {
font-family: var(--default-regular-font, -apple-system),BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; font-family: var(--default-regular-font, -apple-system),BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<h3 style="margin-top: 20px; margin-bottom: 10px;">
boklm pushed to branch main at <a href="https://gitlab.torproject.org/tpo/applications/tor-android-service">The Tor Project / Applications / tor-android-service</a>
</h3>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Commits:
</h4>
<ul>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.torproject.org/tpo/applications/tor-android-service/-/commit/0438a9a4ce1548be08dd2df891a38987bb313d22">0438a9a4</a></strong>
<div>
<span> by Shelikhoo </span> <i> at 2023-03-02T13:11:36+00:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>Bug 40800: Add WebTunnel support
</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
1 changed file:
</h4>
<ul>
<li class="file-stats">
<a href="#b24ba7d889c4e1e96884ed9615f66bc330f9b5e8">
service/src/main/java/org/torproject/android/service/TorService.java
</a>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Changes:
</h4>
<li id="b24ba7d889c4e1e96884ed9615f66bc330f9b5e8">
<a href="https://gitlab.torproject.org/tpo/applications/tor-android-service/-/commit/0438a9a4ce1548be08dd2df891a38987bb313d22#b24ba7d889c4e1e96884ed9615f66bc330f9b5e8"><strong style="font-weight: bold;">service/src/main/java/org/torproject/android/service/TorService.java</strong></a>
<hr style="overflow: hidden; border: 1px solid #e1e1e1;">
<table class="code white" style="border-spacing: 0; border-collapse: collapse; width: auto; font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="379" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="379" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">...</td>
<td class="line_content match" style="color: rgba(31,30,36,0.24); padding: inherit;" bgcolor="#fbfafd">@@ -379,8 +379,10 @@ public final class TorService extends Service implements TorServiceConstants, Or</td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="379" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
379
</td>
<td class="new_line diff-line-num" data-linenumber="379" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
379
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC379" class="line" lang="java"> <span class="k" style="font-weight: 600;">if</span><span class="o" style="font-weight: 600;">(!</span><span class="n" style="color: #333;">pluggableTransportSnow</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">canExecute</span><span class="o" style="font-weight: 600;">())</span> <span class="n" style="color: #333;">pluggableTransportSnow</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">setExecutable</span><span class="o" style="font-weight: 600;">(</span><span class="kc" style="font-weight: 600;">true</span><span class="o" style="font-weight: 600;">);</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="380" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
380
</td>
<td class="new_line diff-line-num" data-linenumber="380" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
380
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC380" class="line" lang="java"> <span class="nc" style="color: #458; font-weight: 600;">File</span> <span class="n" style="color: #333;">pluggableTransportConjure</span> <span class="o" style="font-weight: 600;">=</span> <span class="k" style="font-weight: 600;">new</span> <span class="nc" style="color: #458; font-weight: 600;">File</span><span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">nativeDir</span><span class="o" style="font-weight: 600;">,</span> <span class="s" style="color: #d14;">"libConjure.so"</span><span class="o" style="font-weight: 600;">);</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="381" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
381
</td>
<td class="new_line diff-line-num" data-linenumber="381" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
381
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC381" class="line" lang="java"> <span class="k" style="font-weight: 600;">if</span><span class="o" style="font-weight: 600;">(!</span><span class="n" style="color: #333;">pluggableTransportConjure</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">canExecute</span><span class="o" style="font-weight: 600;">())</span> <span class="n" style="color: #333;">pluggableTransportConjure</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">setExecutable</span><span class="o" style="font-weight: 600;">(</span><span class="kc" style="font-weight: 600;">true</span><span class="o" style="font-weight: 600;">);</span></span>
</pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="382" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="382" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
382
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>+<span id="LC382" class="line" lang="java"> <span class="nc" style="color: #458; font-weight: 600;">File</span> <span class="n" style="color: #333;">pluggableTransportWebtunnel</span> <span class="o" style="font-weight: 600;">=</span> <span class="k" style="font-weight: 600;">new</span> <span class="nc" style="color: #458; font-weight: 600;">File</span><span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">nativeDir</span><span class="o" style="font-weight: 600;">,</span> <span class="s" style="color: #d14;">"libWebtunnel.so"</span><span class="o" style="font-weight: 600;">);</span></span>
</pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="382" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="383" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
383
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>+<span id="LC383" class="line" lang="java"> <span class="k" style="font-weight: 600;">if</span><span class="o" style="font-weight: 600;">(!</span><span class="n" style="color: #333;">pluggableTransportWebtunnel</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">canExecute</span><span class="o" style="font-weight: 600;">())</span> <span class="n" style="color: #333;">pluggableTransportWebtunnel</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">setExecutable</span><span class="o" style="font-weight: 600;">(</span><span class="kc" style="font-weight: 600;">true</span><span class="o" style="font-weight: 600;">);</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="382" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
382
</td>
<td class="new_line diff-line-num" data-linenumber="384" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
384
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC384" class="line" lang="java"></span>
</pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="383" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
383
</td>
<td class="new_line diff-line-num old" data-linenumber="385" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>-<span id="LC383" class="line" lang="java"> <span class="n" style="color: #333;">builder</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">configurePluggableTransportsFromSettings</span><span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">pluggableTransportObfs</span><span class="o" style="font-weight: 600;">,</span> <span class="n" style="color: #333;">pluggableTransportSnow</span><span class="o" style="font-weight: 600;">,</span> <span class="n" style="color: #333;">pluggableTransportConjure</span><span class="o" style="font-weight: 600;">);</span></span>
</pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="384" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="385" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
385
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'>+<span id="LC385" class="line" lang="java"> <span class="n" style="color: #333;">builder</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">configurePluggableTransportsFromSettings</span><span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">pluggableTransportObfs</span><span class="o" style="font-weight: 600;">,</span> <span class="n" style="color: #333;">pluggableTransportSnow</span><span class="o" style="font-weight: 600;">,</span> <span class="n" style="color: #333;">pluggableTransportConjure</span><span class="o" style="font-weight: 600;"><span class="idiff left addition" style="background-color: #c7f0d2;">,</span></span><span class="idiff addition" style="background-color: #c7f0d2;"> </span><span class="n" style="color: #333;"><span class="idiff right addition" style="background-color: #c7f0d2;">pluggableTransportWebtunnel</span></span><span class="o" style="font-weight: 600;">);</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="384" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
384
</td>
<td class="new_line diff-line-num" data-linenumber="386" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
386
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC386" class="line" lang="java"> <span class="n" style="color: #333;">mDataService</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">updateConfigBuilder</span><span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">builder</span><span class="o" style="font-weight: 600;">);</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="385" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
385
</td>
<td class="new_line diff-line-num" data-linenumber="387" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
387
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC387" class="line" lang="java"> <span class="n" style="color: #333;">onionProxyManager</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">getTorInstaller</span><span class="o" style="font-weight: 600;">().</span><span class="na" style="color: #008080;">updateTorConfigCustom</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="386" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
386
</td>
<td class="new_line diff-line-num" data-linenumber="388" style="width: 35px; color: rgba(31,30,36,0.24); border-right-width: 1px; border-right-color: #ececef; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fbfafd">
388
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.875rem; color: #333238; position: relative; font-family: var(--default-mono-font, "Menlo"),"DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span id="LC388" class="line" lang="java"> <span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">builder</span><span class="o" style="font-weight: 600;">.</span><span class="na" style="color: #008080;">asString</span><span class="o" style="font-weight: 600;">());</span></span>
</pre></td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
<a href="https://gitlab.torproject.org/tpo/applications/tor-android-service/-/commit/0438a9a4ce1548be08dd2df891a38987bb313d22">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.torproject.org">gitlab.torproject.org</a>. <a href="https://gitlab.torproject.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.torproject.org/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.torproject.org/tpo/applications/tor-android-service/-/commit/0438a9a4ce1548be08dd2df891a38987bb313d22"}}</script>
</p>
</div>
</body>
</html>