June 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.4] Revert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a"
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 5879909826974579c77bce7e270ad4d077b380c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 18 17:06:18 2018 -0400 Revert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a" This reverts commit 70d91bd059869a0ecf24ceb66942ada4f66f03c9. --- changes/bug26402 | 4 ---- configure.ac | 1 - src/or/include.am | 2 +- src/rust/crypto/Cargo.toml | 2 +- src/test/include.am | 4 ++-- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/changes/bug26402 b/changes/bug26402 deleted file mode 100644 index b21283a2d..000000000 --- a/changes/bug26402 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (compilation): - - When linking the libtor_testing.a library, only include the dirauth - object files once. Previously, they were getting added twice. - Fixes bug 26402; bugfix on 0.3.4.1-alpha. diff --git a/configure.ac b/configure.ac index fa889c152..48ca5bae1 100644 --- a/configure.ac +++ b/configure.ac @@ -2274,7 +2274,6 @@ AC_CONFIG_FILES([ src/config/torrc.sample src/config/torrc.minimal src/rust/.cargo/config - src/rust/build.rs scripts/maint/checkOptionDocs.pl scripts/maint/updateVersions.pl ]) diff --git a/src/or/include.am b/src/or/include.am index 33d76eebd..0e2aac4aa 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -131,7 +131,7 @@ endif src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) if UNITTESTS_ENABLED -src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) +src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) $(MODULE_DIRAUTH_SOURCES) else src_or_libtor_testing_a_SOURCES = endif diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml index 9d302ee3b..c0c5e7bf9 100644 --- a/src/rust/crypto/Cargo.toml +++ b/src/rust/crypto/Cargo.toml @@ -4,7 +4,6 @@ authors = ["The Tor Project", name = "crypto" version = "0.0.1" publish = false -build = "../build.rs" [lib] name = "crypto" @@ -27,3 +26,4 @@ rand_core = { version = "=0.2.0-pre.0", default-features = false } [features] testing = ["tor_log/testing"] + diff --git a/src/test/include.am b/src/test/include.am index 8b61e3520..2ae598b22 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -347,7 +347,7 @@ src_test_test_bt_cl_LDADD = src/common/libor-testing.a \ src/trace/libor-trace.a \ $(rust_ldadd) \ @TOR_LIB_MATH@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS) @@ -375,5 +375,5 @@ EXTRA_DIST += \ src/test/test_workqueue_pipe2.sh \ src/test/test_workqueue_socketpair.sh -test-rust: src/rust/build.rs +test-rust: $(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh"

1 0

[tor/master] remove EOL@EOF advice
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 9af6c48d24ccc38d8e9301a208dddc8695fe63c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 18 16:18:44 2018 -0400 remove EOL@EOF advice --- doc/HACKING/CodingStandards.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 4a8f13716..b830ecea9 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -172,7 +172,6 @@ deviations from our C whitespace style. Generally, we use: - Unix-style line endings - K&R-style indentation - No space before newlines - - A blank line at the end of each file - Never more than one blank line in a row - Always spaces, never tabs - No more than 79-columns per line. @@ -437,4 +436,3 @@ the functions that call your function rely on it doing something, then your function should mention that it does that something in the documentation. If you rely on a function doing something beyond what is in its documentation, then you should watch out, or it might do something else later. -

1 0

[tor/master] New check-spaces rule: Our C files may not have duplicate names.
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 67dc83fa75e2009b4b6bd5d7f005adcaf45d0c77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 18 16:17:11 2018 -0400 New check-spaces rule: Our C files may not have duplicate names. --- scripts/maint/checkSpace.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl index 4f4ac9b0e..633b47e31 100755 --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@ -16,12 +16,21 @@ if ($ARGV[0] =~ /^-/) { $C = ($lang eq '-C'); } +our %basenames = (); + for my $fn (@ARGV) { open(F, "$fn"); my $lastnil = 0; my $lastline = ""; my $incomment = 0; my $in_func_head = 0; + my $basename = $fn; + $basename =~ s#.*/##; + if ($basenames{$basename}) { + msg "Duplicate fnames: $fn and $basenames{$basename}.\n"; + } else { + $basenames{$basename} = $fn; + } while (<F>) { ## Warn about windows-style newlines. # (We insist on lines that end with a single LF character, not

1 0

[tor/master] Finally remove our EOL@EOF check.
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 6af248f27f887a9a36a94a9f87a7b7ce66896c08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 18 16:10:47 2018 -0400 Finally remove our EOL@EOF check. This check was added by mistake long ago. It will be nice to see these EOLs disappear from our code over time. --- scripts/maint/checkSpace.pl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl index 9929932cc..4f4ac9b0e 100755 --- a/scripts/maint/checkSpace.pl +++ b/scripts/maint/checkSpace.pl @@ -126,7 +126,7 @@ for my $fn (@ARGV) { ## Warn about double semi-colons at the end of a line. if (/;;$/) { msg " double semi-colons at the end of $. in $fn\n" - } + } ## Warn about multiple internal spaces. #if (/[^\s,:]\s{2,}[^\s\\=]/) { # msg " X X:$fn:$.\n"; @@ -192,11 +192,6 @@ for my $fn (@ARGV) { } } } - ## Warn if the file doesn't end with a blank line. - # (End each file with a single blank line.) - if (! $lastnil) { - msg " EOL\@EOF:$fn:$.\n"; - } close(F); }

1 0

[stem/master] Add comments + slight style changes for ignored content in unpacking
by atagar＠torproject.org 18 Jun '18

18 Jun '18

commit e20f71923c79c8fcecbe1adee97369c4b0433562 Author: Dave Rolek <dmr-x(a)riseup.net> Date: Sun Jun 3 17:34:48 2018 +0000 Add comments + slight style changes for ignored content in unpacking --- stem/client/cell.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index b90fb7a6..1b30db6c 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -347,7 +347,9 @@ class RelayCell(CircuitCell): stream_id, content = Size.SHORT.pop(content) digest, content = Size.LONG.pop(content) data_len, content = Size.SHORT.pop(content) - data, content = split(content, data_len) + data, _ = split(content, data_len) + + # remaining content (if any) is thrown out (ignored) return RelayCell(circ_id, command, data, digest, stream_id, recognized) @@ -546,6 +548,8 @@ class NetinfoCell(Cell): addr, content = Address.pop(content) sender_addresses.append(addr) + # remaining content (if any) is thrown out (ignored) + return NetinfoCell(receiver_address, sender_addresses, datetime.datetime.utcfromtimestamp(timestamp)) def __hash__(self): @@ -637,6 +641,8 @@ class CertsCell(Cell): cert, content = Certificate.pop(content) certs.append(cert) + # remaining content (if any) is thrown out (ignored) + return CertsCell(certs) def __hash__(self): @@ -692,6 +698,8 @@ class AuthChallengeCell(Cell): method, content = Size.SHORT.pop(content) methods.append(method) + # remaining content (if any) is thrown out (ignored) + return AuthChallengeCell(methods, challenge) def __hash__(self):

1 0

[stem/master] Cell attribute for unused padding
by atagar＠torproject.org 18 Jun '18

18 Jun '18

commit 84e4e657b4785e4888e567fbc04c8ea29fd43cc4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 18 13:02:47 2018 -0700 Cell attribute for unused padding I love our prior commit's effort to be more explicit when Cell data is explicitly ignored. Rather than a commment making this an 'unused' attribute of the base Cell class. This way our callers will have all the information necessary to reconstruct cells if they so desire. --- stem/client/cell.py | 67 ++++++++++++++++++++++++++++++++++-------------- test/unit/client/cell.py | 6 +++++ 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index 1b30db6c..788c4c41 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -75,12 +75,18 @@ STREAM_ID_DISALLOWED = ( class Cell(object): """ Metadata for ORPort cells. + + :var bytes unused: unused filler that padded the cell to the expected size """ NAME = 'UNKNOWN' VALUE = -1 IS_FIXED_SIZE = False + def __init__(self, unused = b''): + super(Cell, self).__init__() + self.unused = unused + @staticmethod def by_name(name): """ @@ -240,7 +246,8 @@ class CircuitCell(Cell): :var int circ_id: circuit id """ - def __init__(self, circ_id): + def __init__(self, circ_id, unused = b''): + super(CircuitCell, self).__init__(unused) self.circ_id = circ_id @@ -261,6 +268,7 @@ class PaddingCell(Cell): elif len(payload) != FIXED_PAYLOAD_LEN: raise ValueError('Padding payload should be %i bytes, but was %i' % (FIXED_PAYLOAD_LEN, len(payload))) + super(PaddingCell, self).__init__() self.payload = payload def pack(self, link_protocol): @@ -279,12 +287,18 @@ class CreateCell(CircuitCell): VALUE = 1 IS_FIXED_SIZE = True + def __init__(self): + super(CreateCell, self).__init__() # TODO: implement + class CreatedCell(CircuitCell): NAME = 'CREATED' VALUE = 2 IS_FIXED_SIZE = True + def __init__(self): + super(CreatedCell, self).__init__() # TODO: implement + class RelayCell(CircuitCell): """ @@ -302,7 +316,7 @@ class RelayCell(CircuitCell): VALUE = 3 IS_FIXED_SIZE = True - def __init__(self, circ_id, command, data, digest = 0, stream_id = 0, recognized = 0): + def __init__(self, circ_id, command, data, digest = 0, stream_id = 0, recognized = 0, unused = b''): if 'HASH' in str(type(digest)): # Unfortunately hashlib generates from a dynamic private class so # isinstance() isn't such a great option. With python2/python3 the @@ -316,7 +330,7 @@ class RelayCell(CircuitCell): else: raise ValueError('RELAY cell digest must be a hash, string, or int but was a %s' % type(digest).__name__) - super(RelayCell, self).__init__(circ_id) + super(RelayCell, self).__init__(circ_id, unused) self.command, self.command_int = RelayCommand.get(command) self.data = str_tools._to_bytes(data) self.recognized = recognized @@ -347,11 +361,9 @@ class RelayCell(CircuitCell): stream_id, content = Size.SHORT.pop(content) digest, content = Size.LONG.pop(content) data_len, content = Size.SHORT.pop(content) - data, _ = split(content, data_len) + data, unused = split(content, data_len) - # remaining content (if any) is thrown out (ignored) - - return RelayCell(circ_id, command, data, digest, stream_id, recognized) + return RelayCell(circ_id, command, data, digest, stream_id, recognized, unused) def __hash__(self): return _hash_attr(self, 'command_int', 'stream_id', 'digest', 'data') @@ -481,6 +493,7 @@ class VersionsCell(Cell): IS_FIXED_SIZE = False def __init__(self, versions): + super(VersionsCell, self).__init__() self.versions = versions def pack(self, link_protocol = None): @@ -517,7 +530,8 @@ class NetinfoCell(Cell): VALUE = 8 IS_FIXED_SIZE = True - def __init__(self, receiver_address, sender_addresses, timestamp = None): + def __init__(self, receiver_address, sender_addresses, timestamp = None, unused = b''): + super(NetinfoCell, self).__init__(unused) self.timestamp = timestamp if timestamp else datetime.datetime.now() self.receiver_address = receiver_address self.sender_addresses = sender_addresses @@ -548,9 +562,7 @@ class NetinfoCell(Cell): addr, content = Address.pop(content) sender_addresses.append(addr) - # remaining content (if any) is thrown out (ignored) - - return NetinfoCell(receiver_address, sender_addresses, datetime.datetime.utcfromtimestamp(timestamp)) + return NetinfoCell(receiver_address, sender_addresses, datetime.datetime.utcfromtimestamp(timestamp), unused = b'') def __hash__(self): return _hash_attr(self, 'timestamp', 'receiver_address', 'sender_addresses') @@ -561,24 +573,36 @@ class RelayEarlyCell(CircuitCell): VALUE = 9 IS_FIXED_SIZE = True + def __init__(self): + super(RelayEarlyCell, self).__init__() # TODO: implement + class Create2Cell(CircuitCell): NAME = 'CREATE2' VALUE = 10 IS_FIXED_SIZE = True + def __init__(self): + super(Create2Cell, self).__init__() # TODO: implement + class Created2Cell(Cell): NAME = 'CREATED2' VALUE = 11 IS_FIXED_SIZE = True + def __init__(self): + super(Created2Cell, self).__init__() # TODO: implement + class PaddingNegotiateCell(Cell): NAME = 'PADDING_NEGOTIATE' VALUE = 12 IS_FIXED_SIZE = True + def __init__(self): + super(PaddingNegotiateCell, self).__init__() # TODO: implement + class VPaddingCell(Cell): """ @@ -599,6 +623,7 @@ class VPaddingCell(Cell): elif size is not None and payload is not None and size != len(payload): raise ValueError('VPaddingCell constructor specified both a size of %i bytes and payload of %i bytes' % (size, len(payload))) + super(VPaddingCell, self).__init__() self.payload = payload if payload is not None else os.urandom(size) def pack(self, link_protocol): @@ -623,7 +648,8 @@ class CertsCell(Cell): VALUE = 129 IS_FIXED_SIZE = False - def __init__(self, certs): + def __init__(self, certs, unused = b''): + super(CertsCell, self).__init__(unused) self.certificates = certs def pack(self, link_protocol): @@ -641,9 +667,7 @@ class CertsCell(Cell): cert, content = Certificate.pop(content) certs.append(cert) - # remaining content (if any) is thrown out (ignored) - - return CertsCell(certs) + return CertsCell(certs, unused = content) def __hash__(self): return _hash_attr(self, 'certificates') @@ -662,12 +686,13 @@ class AuthChallengeCell(Cell): VALUE = 130 IS_FIXED_SIZE = False - def __init__(self, methods, challenge = None): + def __init__(self, methods, challenge = None, unused = b''): if not challenge: challenge = os.urandom(AUTH_CHALLENGE_SIZE) elif len(challenge) != AUTH_CHALLENGE_SIZE: raise ValueError('AUTH_CHALLENGE must be %i bytes, but was %i' % (AUTH_CHALLENGE_SIZE, len(challenge))) + super(AuthChallengeCell, self).__init__(unused) self.challenge = challenge self.methods = methods @@ -698,9 +723,7 @@ class AuthChallengeCell(Cell): method, content = Size.SHORT.pop(content) methods.append(method) - # remaining content (if any) is thrown out (ignored) - - return AuthChallengeCell(methods, challenge) + return AuthChallengeCell(methods, challenge, unused = content) def __hash__(self): return _hash_attr(self, 'challenge', 'methods') @@ -711,8 +734,14 @@ class AuthenticateCell(Cell): VALUE = 131 IS_FIXED_SIZE = False + def __init__(self): + super(AuthenticateCell, self).__init__() # TODO: implement + class AuthorizeCell(Cell): NAME = 'AUTHORIZE' VALUE = 132 IS_FIXED_SIZE = False + + def __init__(self): + super(AuthorizeCell, self).__init__() # TODO: implement diff --git a/test/unit/client/cell.py b/test/unit/client/cell.py index 3d054757..b6734fe7 100644 --- a/test/unit/client/cell.py +++ b/test/unit/client/cell.py @@ -173,6 +173,7 @@ class TestCell(unittest.TestCase): self.assertEqual(data, cell.data) self.assertEqual(digest, cell.digest) self.assertEqual(stream_id, cell.stream_id) + self.assertEqual(b'\x00' * (498 - len(cell.data)), cell.unused) digest = hashlib.sha1(b'hi') self.assertEqual(3257622417, RelayCell(5, 'RELAY_BEGIN_DIR', '', digest, 564346860).digest) @@ -190,6 +191,7 @@ class TestCell(unittest.TestCase): self.assertEqual(circ_id, cell.circ_id) self.assertEqual(reason, cell.reason) self.assertEqual(reason_int, cell.reason_int) + self.assertEqual(b'', cell.unused) self.assertRaisesRegexp(ValueError, 'Circuit closure reason should be a single byte, but was 2', Cell.pop, b'\x80\x00\x00\x00\x04\x01\x01' + ZERO * 507, 5) @@ -200,6 +202,7 @@ class TestCell(unittest.TestCase): cell = Cell.pop(cell_bytes, 5)[0] self.assertEqual(circ_id, cell.circ_id) self.assertEqual(key_material, cell.key_material) + self.assertEqual(b'', cell.unused) self.assertRaisesRegexp(ValueError, 'Key material should be 20 bytes, but was 3', CreateFastCell, 5, 'boo') @@ -211,6 +214,7 @@ class TestCell(unittest.TestCase): self.assertEqual(circ_id, cell.circ_id) self.assertEqual(key_material, cell.key_material) self.assertEqual(derivative_key, cell.derivative_key) + self.assertEqual(b'', cell.unused) self.assertRaisesRegexp(ValueError, 'Key material should be 20 bytes, but was 3', CreateFastCell, 5, 'boo') @@ -227,6 +231,7 @@ class TestCell(unittest.TestCase): self.assertEqual(timestamp, cell.timestamp) self.assertEqual(receiver_address, cell.receiver_address) self.assertEqual(sender_addresses, cell.sender_addresses) + self.assertEqual(b'', cell.unused) def test_vpadding_cell(self): for cell_bytes, payload in VPADDING_CELLS.items(): @@ -262,6 +267,7 @@ class TestCell(unittest.TestCase): cell = Cell.pop(cell_bytes, 2)[0] self.assertEqual(challenge, cell.challenge) self.assertEqual(methods, cell.methods) + self.assertEqual(b'', cell.unused) self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE cell should have a payload of 38 bytes, but only had 16', Cell.pop, b'\x00\x00\x82\x00&' + CHALLENGE[:10] + b'\x00\x02\x00\x01\x00\x03', 2) self.assertRaisesRegexp(ValueError, 'AUTH_CHALLENGE should have 3 methods, but only had 4 bytes for it', Cell.pop, b'\x00\x00\x82\x00&' + CHALLENGE + b'\x00\x03\x00\x01\x00\x03', 2)

1 0

[stem/master] Cell attribute for unused padding
by atagar＠torproject.org 18 Jun '18

18 Jun '18

commit 0192b29a4784465e5f69f11ced584a54644e4a90 Merge: 76c17caa 84e4e657 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 18 13:07:38 2018 -0700 Cell attribute for unused padding Some cells (often fixed width) are padded with extra bytes that are ignored. Rather than dropping these, assigning them to an 'unused' attribute of the base Cell class so callers receive all the data that went into constructing the cell. stem/client/cell.py | 59 +++++++++++++++++++++++++++++++++++++++--------- test/unit/client/cell.py | 6 +++++ 2 files changed, 54 insertions(+), 11 deletions(-)

1 0

[tor/master] Remove redundant typedefs from _st.h files
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 29982e51909c657d3d1323e332d4517d9e9f8046 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 18 16:04:47 2018 -0400 Remove redundant typedefs from _st.h files The typedefs are already in or.h --- src/or/connection_st.h | 5 ++--- src/or/dir_server_st.h | 5 ++--- src/or/networkstatus_voter_info_st.h | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/or/connection_st.h b/src/or/connection_st.h index b65238693..b327fbc1a 100644 --- a/src/or/connection_st.h +++ b/src/or/connection_st.h @@ -27,7 +27,7 @@ struct buf_t; * conn->outbuf. Connections differ primarily in the functions called * to fill and drain these buffers. */ -typedef struct connection_t { +struct connection_t { uint32_t magic; /**< For memory debugging: must equal one of * *_CONNECTION_MAGIC. */ @@ -126,7 +126,6 @@ typedef struct connection_t { /** Bytes written since last call to control_event_conn_bandwidth_used(). * Only used if we're configured to emit CONN_BW events. */ uint32_t n_written_conn_bw; -} connection_t; +}; #endif - diff --git a/src/or/dir_server_st.h b/src/or/dir_server_st.h index b9d3f1c55..73aa5da06 100644 --- a/src/or/dir_server_st.h +++ b/src/or/dir_server_st.h @@ -13,7 +13,7 @@ /** Represents information about a single trusted or fallback directory * server. */ -typedef struct dir_server_t { +struct dir_server_t { char *description; char *nickname; char *address; /**< Hostname. */ @@ -49,7 +49,6 @@ typedef struct dir_server_t { * as a routerstatus_t. Not updated by the * router-status management code! **/ -} dir_server_t; +}; #endif - diff --git a/src/or/networkstatus_voter_info_st.h b/src/or/networkstatus_voter_info_st.h index 32ea597bd..56b89b412 100644 --- a/src/or/networkstatus_voter_info_st.h +++ b/src/or/networkstatus_voter_info_st.h @@ -8,7 +8,7 @@ #define NETWORKSTATUS_VOTER_INFO_ST_H /** Information about a single voter in a vote or a consensus. */ -typedef struct networkstatus_voter_info_t { +struct networkstatus_voter_info_t { /** Declared SHA-1 digest of this voter's identity key */ char identity_digest[DIGEST_LEN]; char *nickname; /**< Nickname of this voter */ @@ -25,7 +25,6 @@ typedef struct networkstatus_voter_info_t { /* Nothing from here on is signed. */ /** The signature of the document and the signature's status. */ smartlist_t *sigs; -} networkstatus_voter_info_t; +}; #endif -

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 18 Jun '18

18 Jun '18

commit 39c139e0dffaf3e9737f4bfd9f7320dbed251ec6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 18 19:16:46 2018 +0000 Update translations for abouttor-homepage --- te/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/te/aboutTor.dtd b/te/aboutTor.dtd index 676878e27..115783d79 100644 --- a/te/aboutTor.dtd +++ b/te/aboutTor.dtd @@ -18,7 +18,7 @@ <!ENTITY aboutTor.failure.label "Something Went Wrong!"> <!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.search.label "Search"> +<!ENTITY aboutTor.search.label "శోధన"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torInfo1.label "Additional Info:">

1 0

[tor/master] test: Add missing headers in test_controller.c
by dgoulet＠torproject.org 18 Jun '18

18 Jun '18

commit a8e76f3824dc0133dc7981dadc9c51190af3992c Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jun 18 15:06:24 2018 -0400 test: Add missing headers in test_controller.c After the big or.h refactoring, one single unit test file was missing two headers for node_t and microdesc_t. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_controller.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_controller.c b/src/test/test_controller.c index e91aa2e72..4f29512c0 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -16,6 +16,8 @@ #include "control_connection_st.h" #include "download_status_st.h" +#include "microdesc_st.h" +#include "node_st.h" static void test_add_onion_helper_keyarg_v3(void *arg)

1 0