October 2016 - tor-commits - lists.torproject.org

[tor/master] Bridge-using clients now use their cached microdesc consensus
by nickm＠torproject.org 19 Oct '16

19 Oct '16

commit bfaded9143d127cb32407a7a58159383fa9ed333 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Oct 1 16:34:17 2016 -0400 Bridge-using clients now use their cached microdesc consensus Clients that use bridges were ignoring their cached microdesc-flavor consensus files, because they only thought they should use the microdesc flavor once they had a known-working bridge that could offer microdescs, and at first boot no bridges are known-working. This bug caused bridge-using clients to download a new microdesc consensus on each startup. Fixes bug 20269; bugfix on 0.2.3.12-alpha. --- changes/bug20269 | 4 ++++ src/or/entrynodes.c | 21 --------------------- src/or/entrynodes.h | 1 - src/or/microdesc.c | 6 +----- 4 files changed, 5 insertions(+), 27 deletions(-) diff --git a/changes/bug20269 b/changes/bug20269 new file mode 100644 index 0000000..5d580bf --- /dev/null +++ b/changes/bug20269 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When clients that use bridges start up with a cached consensus + on disk, they were ignoring it and downloading a new one. Now they + use the cached one. Fixes bug 20269; bugfix on 0.2.3.12-alpha. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 265b6dc..ff02fed 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2521,27 +2521,6 @@ entries_retry_all(const or_options_t *options) entries_retry_helper(options, 1); } -/** Return true if at least one of our bridges runs a Tor version that can - * provide microdescriptors to us. If not, we'll fall back to asking for - * full descriptors. */ -int -any_bridge_supports_microdescriptors(void) -{ - const node_t *node; - if (!get_options()->UseBridges || !entry_guards) - return 0; - SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, e) { - node = node_get_by_id(e->identity); - if (node && node->is_running && - node_is_bridge(node) && node_is_a_configured_bridge(node)) { - /* This is one of our current bridges, and we know enough about - * it to know that it will be able to answer our questions. */ - return 1; - } - } SMARTLIST_FOREACH_END(e); - return 0; -} - /** Release all storage held by the list of entry guards and related * memory structs. */ void diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 1021e67..c0374ae 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -143,7 +143,6 @@ int any_bridge_descriptors_known(void); int entries_known_but_down(const or_options_t *options); void entries_retry_all(const or_options_t *options); -int any_bridge_supports_microdescriptors(void); const smartlist_t *get_socks_args_by_bridge_addrport(const tor_addr_t *addr, uint16_t port); diff --git a/src/or/microdesc.c b/src/or/microdesc.c index a81dc54..57efc72 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -920,11 +920,7 @@ we_use_microdescriptors_for_circuits(const or_options_t *options) int ret = options->UseMicrodescriptors; if (ret == -1) { /* UseMicrodescriptors is "auto"; we need to decide: */ - /* If we are configured to use bridges and none of our bridges - * know what a microdescriptor is, the answer is no. */ - if (options->UseBridges && !any_bridge_supports_microdescriptors()) - return 0; - /* Otherwise, we decide that we'll use microdescriptors iff we are + /* We'll use microdescriptors iff we are * not a server, and we're not autofetching everything. */ /* XXXX++ what does not being a server have to do with it? also there's * a partitioning issue here where bridges differ from clients. */

1 0

[tor/master] Unify code in channel_write_*cell()
by nickm＠torproject.org 19 Oct '16

19 Oct '16

commit ec4142abdf7fa4efaa281413e31acc93bf22ea4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 19 17:07:23 2016 -0400 Unify code in channel_write_*cell() Patch from pingl; patch for 13827. --- changes/bug13827 | 3 ++ src/or/channel.c | 93 +++++++++++++++++++------------------------------------- src/or/channel.h | 3 ++ 3 files changed, 38 insertions(+), 61 deletions(-) diff --git a/changes/bug13827 b/changes/bug13827 new file mode 100644 index 0000000..2235a3f --- /dev/null +++ b/changes/bug13827 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove duplicate code in the channel_write_*cell() functions. + Closes ticket 13827; patch from Pingl. diff --git a/src/or/channel.c b/src/or/channel.c index f547aea..75aab3c 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1838,45 +1838,58 @@ channel_write_cell_queue_entry(channel_t *chan, cell_queue_entry_t *q) } } -/** - * Write a cell to a channel +/** Write a generic cell type to a channel * - * Write a fixed-length cell to a channel using the write_cell() method. - * This is equivalent to the pre-channels connection_or_write_cell_to_buf(); - * it is called by the transport-independent code to deliver a cell to a - * channel for transmission. + * Write a generic cell to a channel. It is called by channel_write_cell(), + * channel_write_var_cell() and channel_write_packed_cell() in order to reduce + * code duplication. Notice that it takes cell as pointer of type void, + * this can be dangerous because no type check is performed. */ void -channel_write_cell(channel_t *chan, cell_t *cell) +channel_write_cell_generic_(channel_t *chan, const char *cell_type, + void *cell, cell_queue_entry_t *q) { - cell_queue_entry_t q; tor_assert(chan); tor_assert(cell); if (CHANNEL_IS_CLOSING(chan)) { - log_debug(LD_CHANNEL, "Discarding cell_t %p on closing channel %p with " - "global ID "U64_FORMAT, cell, chan, + log_debug(LD_CHANNEL, "Discarding %c %p on closing channel %p with " + "global ID "U64_FORMAT, *cell_type, cell, chan, U64_PRINTF_ARG(chan->global_identifier)); tor_free(cell); return; } - log_debug(LD_CHANNEL, - "Writing cell_t %p to channel %p with global ID " - U64_FORMAT, + "Writing %c %p to channel %p with global ID " + U64_FORMAT, *cell_type, cell, chan, U64_PRINTF_ARG(chan->global_identifier)); - q.type = CELL_QUEUE_FIXED; - q.u.fixed.cell = cell; - channel_write_cell_queue_entry(chan, &q); - + channel_write_cell_queue_entry(chan, q); /* Update the queue size estimate */ channel_update_xmit_queue_size(chan); } /** + * Write a cell to a channel + * + * Write a fixed-length cell to a channel using the write_cell() method. + * This is equivalent to the pre-channels connection_or_write_cell_to_buf(); + * it is called by the transport-independent code to deliver a cell to a + * channel for transmission. + */ + +void +channel_write_cell(channel_t *chan, cell_t *cell) +{ + cell_queue_entry_t q; + q.type = CELL_QUEUE_FIXED; + q.u.fixed.cell = cell; + channel_write_cell_generic_(chan, "cell_t", cell, &q); +} + +/** * Write a packed cell to a channel * * Write a packed cell to a channel using the write_cell() method. This is @@ -1888,30 +1901,9 @@ void channel_write_packed_cell(channel_t *chan, packed_cell_t *packed_cell) { cell_queue_entry_t q; - - tor_assert(chan); - tor_assert(packed_cell); - - if (CHANNEL_IS_CLOSING(chan)) { - log_debug(LD_CHANNEL, "Discarding packed_cell_t %p on closing channel %p " - "with global ID "U64_FORMAT, packed_cell, chan, - U64_PRINTF_ARG(chan->global_identifier)); - packed_cell_free(packed_cell); - return; - } - - log_debug(LD_CHANNEL, - "Writing packed_cell_t %p to channel %p with global ID " - U64_FORMAT, - packed_cell, chan, - U64_PRINTF_ARG(chan->global_identifier)); - q.type = CELL_QUEUE_PACKED; q.u.packed.packed_cell = packed_cell; - channel_write_cell_queue_entry(chan, &q); - - /* Update the queue size estimate */ - channel_update_xmit_queue_size(chan); + channel_write_cell_generic_(chan, "packed_cell_t", packed_cell, &q); } /** @@ -1927,30 +1919,9 @@ void channel_write_var_cell(channel_t *chan, var_cell_t *var_cell) { cell_queue_entry_t q; - - tor_assert(chan); - tor_assert(var_cell); - - if (CHANNEL_IS_CLOSING(chan)) { - log_debug(LD_CHANNEL, "Discarding var_cell_t %p on closing channel %p " - "with global ID "U64_FORMAT, var_cell, chan, - U64_PRINTF_ARG(chan->global_identifier)); - var_cell_free(var_cell); - return; - } - - log_debug(LD_CHANNEL, - "Writing var_cell_t %p to channel %p with global ID " - U64_FORMAT, - var_cell, chan, - U64_PRINTF_ARG(chan->global_identifier)); - q.type = CELL_QUEUE_VAR; q.u.var.var_cell = var_cell; - channel_write_cell_queue_entry(chan, &q); - - /* Update the queue size estimate */ - channel_update_xmit_queue_size(chan); + channel_write_cell_generic_(chan, "var_cell_t", var_cell, &q); } /** diff --git a/src/or/channel.h b/src/or/channel.h index a711b56..44a3901 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -382,6 +382,9 @@ struct cell_queue_entry_s { STATIC int chan_cell_queue_len(const chan_cell_queue_t *queue); STATIC void cell_queue_entry_free(cell_queue_entry_t *q, int handed_off); + +void channel_write_cell_generic_(channel_t *chan, const char *cell_type, + void *cell, cell_queue_entry_t *q); #endif /* Channel operations for subclasses and internal use only */

1 0

[tor/master] Bump version on master to 0.3.0.0-alpha-dev.
by nickm＠torproject.org 19 Oct '16

19 Oct '16

commit e12560db763bdf03c0b2e53ba34a5a9b1f621bdd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 19 17:03:22 2016 -0400 Bump version on master to 0.3.0.0-alpha-dev. --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d35f83c..27d7577 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.4-alpha-dev]) +AC_INIT([tor],[0.3.0.0-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 94bbfe2..a76bc22 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.4-alpha-dev" +!define VERSION "0.3.0.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d902423..c113efb 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.4-alpha-dev" +#define VERSION "0.3.0.0-alpha-dev"

1 0

[collector/master] Move index.json* files to index/ subdirectory.
by karsten＠torproject.org 19 Oct '16

19 Oct '16

commit 03978991666578f70affbb3d6f24a90e6495105a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Oct 19 19:43:15 2016 +0200 Move index.json* files to index/ subdirectory. Implements #20408. --- src/main/java/org/torproject/collector/index/CreateIndexJson.java | 1 + src/main/resources/collector.properties | 2 +- src/main/webapp/index.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/collector/index/CreateIndexJson.java index 5ec2014..f3fcc13 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java @@ -195,6 +195,7 @@ public class CreateIndexJson extends CollecTorMain { } private void writeIndex(IndexNode indexNode) throws IOException { + indexJsonFile.getParentFile().mkdirs(); Gson gson = new GsonBuilder().create(); String indexNodeString = gson.toJson(indexNode); Writer[] writers = new Writer[] { diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index 4441e1d..c8a9e2f 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -53,7 +53,7 @@ UpdateindexOffsetMinutes = 0 InstanceBaseUrl = https://collector.torproject.org # The target location for index.json and its compressed # versions index.json.gz, index.json.bz2, and index.json.xz -IndexPath = . +IndexPath = index # The top-level directory for archived descriptors. ArchivePath = archive # The top-level directory for the recent descriptors that were diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 7ed9145..a1e5523 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -836,7 +836,7 @@ wget --recursive \ # turn on recursive retrieving <h2 id="index-json" class="hover">Custom downloaders using provided <tt>index.json</tt> <a href="#index-json" class="hover">#</a></h2> -<p>Another automated way to download descriptors is to develop a tool that uses the provided <a href="index.json"><tt>index.json</tt></a> file or one of its compressed versions <a href="index.json.gz"><tt>index.json.gz</tt></a>, <a href="index.json.bz2"><tt>index.json.bz2</tt></a>, or <a href="index.json.xz"><tt>index.json.xz</tt></a>. +<p>Another automated way to download descriptors is to develop a tool that uses the provided <a href="index/index.json"><tt>index.json</tt></a> file or one of its compressed versions <a href="index/index.json.gz"><tt>index.json.gz</tt></a>, <a href="index/index.json.bz2"><tt>index.json.bz2</tt></a>, or <a href="index/index.json.xz"><tt>index.json.xz</tt></a>. These files contain a machine-readable representation of all descriptor files available on this site. Index files use the following custom JSON data format that might still be extended at a later time:</p> <ul>

1 0

[metrics-lib/master] Changed 'descriptor.collector' default value to DescriptorIndexCollector.
by karsten＠torproject.org 19 Oct '16

19 Oct '16

commit d00b8ac09b0bd1225e882137460a4847c88e6621 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Oct 19 12:30:06 2016 +0200 Changed 'descriptor.collector' default value to DescriptorIndexCollector. Implements task-20404. --- CHANGELOG.md | 6 ++++++ .../java/org/torproject/descriptor/DescriptorSourceFactory.java | 2 +- .../java/org/torproject/descriptor/DescriptorSourceFactoryTest.java | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5cee05..0f4f2eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changes in version 1.?.? - 2016-1?-?? + * Major changes + - Make the DescriptorCollector implementation that uses CollecTor's + index.json file to determine which descriptor files to fetch the + new default. Applications must provide gson-2.2.4.jar or higher + as dependency. + * Minor changes - Avoid running into an IOException and logging a warning for it. diff --git a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java index 9c78e5c..a9d1558 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java @@ -72,7 +72,7 @@ public final class DescriptorSourceFactory { * @since 1.0.0 */ public static final String COLLECTOR_DEFAULT = - "org.torproject.descriptor.impl.DescriptorCollectorImpl"; + "org.torproject.descriptor.index.DescriptorIndexCollector"; /** * Property name for overriding the implementation of the diff --git a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java index 5f2e42e..167c625 100644 --- a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java +++ b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java @@ -9,10 +9,10 @@ import org.torproject.descriptor.DescriptorDownloader; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorReader; import org.torproject.descriptor.ImplementationNotAccessibleException; -import org.torproject.descriptor.impl.DescriptorCollectorImpl; import org.torproject.descriptor.impl.DescriptorDownloaderImpl; import org.torproject.descriptor.impl.DescriptorParserImpl; import org.torproject.descriptor.impl.DescriptorReaderImpl; +import org.torproject.descriptor.index.DescriptorIndexCollector; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -35,7 +35,7 @@ public class DescriptorSourceFactoryTest { public void testDefaults() { setProperties(defaults); DescriptorCollector dc = DescriptorSourceFactory.createDescriptorCollector(); - assertTrue(dc instanceof DescriptorCollectorImpl); + assertTrue(dc instanceof DescriptorIndexCollector); DescriptorDownloader dd = DescriptorSourceFactory.createDescriptorDownloader(); assertTrue(dd instanceof DescriptorDownloaderImpl); DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser(); @@ -101,7 +101,7 @@ public class DescriptorSourceFactoryTest { } -class DummyCollectorImplementation extends DescriptorCollectorImpl { +class DummyCollectorImplementation extends DescriptorIndexCollector { static int count; public DummyCollectorImplementation() { count++;

1 0

[metrics-lib/master] Implements task-20039: DescriptorIndexCollector now accepts a URL path.
by karsten＠torproject.org 19 Oct '16

19 Oct '16

commit 421f38eeb95ba86d8b2f3007f62a111dc090d991 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Oct 19 12:12:06 2016 +0200 Implements task-20039: DescriptorIndexCollector now accepts a URL path. If only a base URL is given, try to retrieve 'index/index.json' from the given host URL. --- .../descriptor/index/DescriptorIndexCollector.java | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java index 4f62be6..d32f811 100644 --- a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java +++ b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java @@ -33,12 +33,14 @@ public class DescriptorIndexCollector implements DescriptorCollector { .getLogger(DescriptorIndexCollector.class); /** - * The parameter usage differs from the interface: - * <code>collecTorIndexUrl</code> is expected to contain the URL - * for an index JSON file (plain or compressed). + * If <code>collecTorIndexUrlString</code> contains just the + * base url, e.g. https://some.host.org, the path + * <code>/index/index.json</code> will be appended. + * If a path is given (even just a final slash, e.g. https://some.host.org/) + * the <code>collecTorIndexUrlString</code> will be used as is. */ @Override - public void collectDescriptors(String collecTorIndexUrl, + public void collectDescriptors(String collecTorIndexUrlString, String[] remoteDirectories, long minLastModified, File localDirectory, boolean deleteExtraneousLocalFiles) { if (minLastModified < 0) { @@ -52,11 +54,18 @@ public class DescriptorIndexCollector implements DescriptorCollector { SortedMap<String, Long> localFiles = statLocalDirectory(localDirectory); SortedMap<String, FileNode> remoteFiles = null; IndexNode index = null; + String indexUrlString = ""; try { - index = IndexNode.fetchIndex(collecTorIndexUrl); + URL indexUrl = new URL(collecTorIndexUrlString); + indexUrlString = indexUrl.toString(); + if (indexUrl.getPath().isEmpty()) { + indexUrlString += "/index/index.json"; + } + index = IndexNode.fetchIndex(indexUrlString); remoteFiles = index.retrieveFilesIn(remoteDirectories); - } catch (Exception ioe) { - throw new RuntimeException("Cannot fetch index. ", ioe); + } catch (Exception ex) { + throw new RuntimeException("Cannot fetch index from '" + + indexUrlString + "'.", ex); } this.fetchRemoteFiles(index.path, remoteFiles, minLastModified, localDirectory, localFiles);

1 0

[metrics-lib/master] Logs the served implementation. Implements task-20334.
by karsten＠torproject.org 19 Oct '16

19 Oct '16

commit 3acc8fe61d70554a8332557ac26bf639a68bce15 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Oct 19 12:25:21 2016 +0200 Logs the served implementation. Implements task-20334. --- .../java/org/torproject/descriptor/DescriptorSourceFactory.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java index a9d1558..2a58552 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java @@ -3,6 +3,9 @@ package org.torproject.descriptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Factory for descriptor sources which in turn produce descriptors. * @@ -38,6 +41,9 @@ package org.torproject.descriptor; */ public final class DescriptorSourceFactory { + private static Logger log = LoggerFactory.getLogger( + DescriptorSourceFactory.class); + /** * Default implementation of the {@link DescriptorDownloader} * descriptor source. @@ -174,6 +180,7 @@ public final class DescriptorSourceFactory { } object = ClassLoader.getSystemClassLoader().loadClass(clazzName) .newInstance(); + log.info("Serving implementation {} for {}.", clazzName, type); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) { throw new ImplementationNotAccessibleException("Cannot load class "

1 0

[metrics-lib/master] Added checkstyle unused imports module.
by karsten＠torproject.org 19 Oct '16

19 Oct '16

commit 24a8d1d5f6f4abe63c69f4c6a1b019eaaff104c1 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Oct 19 12:11:33 2016 +0200 Added checkstyle unused imports module. --- src/test/resources/metrics_checks.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/resources/metrics_checks.xml b/src/test/resources/metrics_checks.xml index 0777894..60fffe2 100644 --- a/src/test/resources/metrics_checks.xml +++ b/src/test/resources/metrics_checks.xml @@ -14,6 +14,8 @@ - Relaxed requirement that catch parameters must be at least two characters long [CatchParameterName]. + - Added a check for unused imports [UnusedImports]. + Checkstyle is very configurable. Be sure to read the documentation at http://checkstyle.sf.net (or in your downloaded distribution). @@ -52,6 +54,7 @@ </module> <module name="AvoidStarImport"/> <module name="OneTopLevelClass"/> + <module name="UnusedImports"/> <module name="NoLineWrap"/> <module name="EmptyBlock"> <property name="option" value="TEXT"/>

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 19 Oct '16

19 Oct '16

commit 5b61ca4d45f5f481693a6e11390612485bab9304 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 11:15:51 2016 +0000 Update translations for torbirdy_completed --- ko/torbirdy.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/ko/torbirdy.properties b/ko/torbirdy.properties index 2dfb0d6..c97244b 100644 --- a/ko/torbirdy.properties +++ b/ko/torbirdy.properties @@ -6,6 +6,7 @@ torbirdy.enabled.custom=Torbirdy 활성화됨 : 개인 프록시 torbirdy.enabled.torification=TorBirdy 활성화됨 : 투명 Tor화 torbirdy.enabled.whonix=TorBridy 활성화됨 : Whonix torbirdy.disabled=TorBirdy: 비활성화! +torbirdy.enabled=TorBirdy: 활성화됨 torbirdy.email.prompt=TorBirdy는 귀하의 익명을 지키기 위해 썬더버드의 자동 설정 마법사를 비활성시켰습니다. \n\n%를 위한 추천되는 보안 설정은 이미 설정되었습니다. \n\n귀하는 다른 계정 설정을 수동으로 설정할 수 있습니다.

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 19 Oct '16

19 Oct '16

commit 316cc454ec591d163904bea1b5b041d9821a766b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 11:15:45 2016 +0000 Update translations for torbirdy --- ko/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/torbirdy.properties b/ko/torbirdy.properties index a001e66..c97244b 100644 --- a/ko/torbirdy.properties +++ b/ko/torbirdy.properties @@ -6,7 +6,7 @@ torbirdy.enabled.custom=Torbirdy 활성화됨 : 개인 프록시 torbirdy.enabled.torification=TorBirdy 활성화됨 : 투명 Tor화 torbirdy.enabled.whonix=TorBridy 활성화됨 : Whonix torbirdy.disabled=TorBirdy: 비활성화! -torbirdy.enabled=TorBirdy: Enabled +torbirdy.enabled=TorBirdy: 활성화됨 torbirdy.email.prompt=TorBirdy는 귀하의 익명을 지키기 위해 썬더버드의 자동 설정 마법사를 비활성시켰습니다. \n\n%를 위한 추천되는 보안 설정은 이미 설정되었습니다. \n\n귀하는 다른 계정 설정을 수동으로 설정할 수 있습니다.

1 0