[tor-commits] [chutney/master] Fix typos in chutney IPv6 client templates and networks

[teor]

commit 15f8d8d4604c8202d22c5d0f5e749d061e19ebc9
Author: teor 
Date:   Tue Sep 6 14:18:20 2016 +1000

Fix typos in chutney IPv6 client templates and networks
---
 networks/hs-ipv6| 2 +-
 torrc_templates/hs-only-v6.tmpl | 2 +-
 torrc_templates/hs-use-v6.tmpl  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/networks/hs-ipv6 b/networks/hs-ipv6
index 88223ba..3e3984f 100644
--- a/networks/hs-ipv6
+++ b/networks/hs-ipv6
@@ -10,7 +10,7 @@ NonExitRelay6 = Node(tag="r", relay=1,
  torrc="relay-orport-v6-non-exit.tmpl")
 Client = Node(tag="c", torrc="client.tmpl")
 Client6 = Node(tag="c", torrc="client-only-v6.tmpl")
-HS6 = Node(tag="h", hs=1, torrc="hs.tmpl")
+HS6 = Node(tag="h", hs=1, torrc="hs-only-v6.tmpl")
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks
diff --git a/torrc_templates/hs-only-v6.tmpl b/torrc_templates/hs-only-v6.tmpl
index e72da8f..d487e8c 100644
--- a/torrc_templates/hs-only-v6.tmpl
+++ b/torrc_templates/hs-only-v6.tmpl
@@ -1,3 +1,3 @@
-${include:hs.i}
+${include:hs.tmpl}
 # Hidden services are just another kind of client
 ${include:client-only-v6.i}
diff --git a/torrc_templates/hs-use-v6.tmpl b/torrc_templates/hs-use-v6.tmpl
index c252854..b3ff7a7 100644
--- a/torrc_templates/hs-use-v6.tmpl
+++ b/torrc_templates/hs-use-v6.tmpl
@@ -1,3 +1,3 @@
-${include:hs.i}
+${include:hs.tmpl}
 # Hidden services are just another kind of client
 ${include:client-use-v6.i}

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [chutney/master] Add IPv6 client support to chutney

[teor]

commit 696a55c0e2cdfa00b5297748196b9cea260a3ec5
Author: teor 
Date:   Tue Sep 6 13:49:24 2016 +1000

Add IPv6 client support to chutney

This adds the following flavours:
 * client-ipv6-only: test that an IPv6 client can bootstrap and transmit 
data
 * hs-client-ipv6: test that an IPv6 client can connect to an IPv4 HS
 * hs-ipv6: test that IPv4 and IPv6 clients can connect to an IPv6 HS

It also adds support for IPv6 hidden services, relays, and authorities.
---
 README| 19 ---
 lib/chutney/TorNet.py | 20 ++--
 networks/client-ipv6-only | 20 
 networks/hs-client-ipv6   | 24 
 networks/hs-ipv6  | 25 +
 tools/test-network.sh | 10 ++
 torrc_templates/authority-orport-v6-exit.tmpl |  7 +++
 torrc_templates/authority-orport-v6.tmpl  |  7 +++
 torrc_templates/client-only-v6.i  | 10 ++
 torrc_templates/client-only-v6.tmpl   |  2 ++
 torrc_templates/client-use-v6.i   |  3 +++
 torrc_templates/client-use-v6.tmpl|  2 ++
 torrc_templates/hs-only-v6.tmpl   |  3 +++
 torrc_templates/hs-use-v6.tmpl|  3 +++
 torrc_templates/orport-v6.i   |  4 
 torrc_templates/relay-orport-v6-exit.tmpl | 10 ++
 torrc_templates/relay-orport-v6-non-exit.tmpl |  4 
 17 files changed, 160 insertions(+), 13 deletions(-)

diff --git a/README b/README
index f720a81..1d7fa1d 100644
--- a/README
+++ b/README
@@ -44,6 +44,10 @@ Traffic Options:
   --connections  CHUTNEY_CONNECTIONS
   --hs-multi-client  CHUTNEY_HS_MULTI_CLIENT
 
+Address Options:
+  --ipv4 CHUTNEY_LISTEN_ADDRESS
+  --ipv6 CHUTNEY_LISTEN_ADDRESS_V6
+
 Standard Actions:
   ./chutney configure networks/basic
   ./chutney start networks/basic
@@ -108,14 +112,15 @@ Waiting for the network:
 
 Changing the network address:
 
-   Chutney defaults to binding to localhost. To change the bind address,
-   set the CHUTNEY_LISTEN_ADDRESS environment variable. Setting it to some
-   interface's IP address allows us to make the simulated Tor network
-   available on the network.
+   Chutney defaults to binding to localhost. To change the IPv4 bind address,
+   set the CHUTNEY_LISTEN_ADDRESS environment variable. Similarly, change
+   CHUTNEY_LISTEN_ADDRESS_V6 for IPv6: it defaults to "no IPv6 address".
+   Setting it to some interface's IP address allows us to make the simulated
+   Tor network available on the network.
 
-   IPv6 support for both Tor and Chutney is a work in progress. If your system
-   returns IPv6 ::1 as the (first) address for localhost, you might need to
-   set CHUTNEY_LISTEN_ADDRESS="127.0.0.1" for chutney to work.
+   IPv6 support for both Tor and Chutney is a work in progress. Currently,
+   chutney verifies IPv6 client, bridge client, and hidden service
+   connections. It does not use IPv6 SOCKSPort or Exit traffic.
 
 The configuration files:
   networks/basic holds the configuration for the network you're configuring
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 352e671..6db7ad4 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -206,9 +206,9 @@ class LocalNodeBuilder(NodeBuilder):
 # tor_gencert -- path to tor_gencert binary
 # tor -- path to tor binary
 # auth_cert_lifetime -- lifetime of authority certs, in months.
-# ip -- IP to listen on (used only if authority or bridge)
-# ipv6_addr -- IPv6 address to listen on (used only if ipv6 bridge)
-# orport, dirport -- (used only if authority)
+# ip -- IP to listen on
+# ipv6_addr -- IPv6 address to listen on
+# orport, dirport -- used on authorities, relays, and bridges
 # fingerprint -- used only if authority
 # dirserver_flags -- used only if authority
 # nick -- nickname of this router
@@ -461,8 +461,14 @@ class LocalNodeBuilder(NodeBuilder):
 
 authlines = ""
 for authopt in options:
-authlines += "%s %s orport=%s %s %s:%s %s\n" % (
-authopt, self._env['nick'], self._env['orport'],
+authlines += "%s %s orport=%s" % (
+authopt, self._env['nick'], self._env['orport'])
+# It's ok to give an authority's IPv6 address to an IPv4-only
+# client or relay: it will and must ignore it
+if self._env['ipv6_addr'] is not None:
+authlines += " ipv6=%s:%s" % (self._env['ipv6_addr'],
+  self._env['orport'])
+authlines += " %s %s:%s %s\n" % (
 self._env['dirserver_flags'], self._env['ip'],
 self._env['dirport'], self._env['fingerprint'])
 return authlines
@@ -675,7 

[tor-commits] [chutney/master] We don't verify using IPv6 SOCKS or Exit traffic, add TODOs for that

[teor]

commit 62322e3d50369def8e095bb124594919aada9542
Author: teor 
Date:   Tue Sep 6 13:50:49 2016 +1000

We don't verify using IPv6 SOCKS or Exit traffic, add TODOs for that
---
 scripts/chutney_tests/verify.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/chutney_tests/verify.py b/scripts/chutney_tests/verify.py
index 67ca642..b887ee7 100644
--- a/scripts/chutney_tests/verify.py
+++ b/scripts/chutney_tests/verify.py
@@ -28,10 +28,12 @@ def run_test(network):
 def _verify_traffic(network):
 """Verify (parts of) the network by sending traffic through it
 and verify what is received."""
+# TODO: IPv6 SOCKSPorts, SOCKSPorts with IPv6Traffic, and IPv6 Exits
 LISTEN_ADDR = network._dfltEnv['ip']
 LISTEN_PORT = 4747  # FIXME: Do better! Note the default exit policy.
 # HSs must have a HiddenServiceDir with
 # "HiddenServicePort  :"
+# TODO: Test :
 HS_PORT = 5858
 # The amount of data to send between each source-sink pair,
 # each time the source connects.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [chutney/master] Refactor the IPv6 bridge torrc template to use orport-v6.i

[teor]

commit 840d88a502c3fa9363e7e852cd1a6943edec467f
Author: teor 
Date:   Tue Sep 6 13:51:20 2016 +1000

Refactor the IPv6 bridge torrc template to use orport-v6.i
---
 torrc_templates/bridge-v6.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/torrc_templates/bridge-v6.tmpl b/torrc_templates/bridge-v6.tmpl
index 7e4ff91..3879348 100644
--- a/torrc_templates/bridge-v6.tmpl
+++ b/torrc_templates/bridge-v6.tmpl
@@ -1,3 +1,4 @@
 ${include:bridge.tmpl}
 
-OrPort ${ipv6_addr}:${orport} IPv6Only
+# A bridge that has an IPv6 ORPort
+${include:orport-v6.i}

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Fix levelsToRemove

[sukhbir]

commit 70c38e1ec0fe72ac4231d2f65f21fd374d5c94a0
Author: Arlo Breault 
Date:   Mon Sep 5 15:34:25 2016 -0700

Fix levelsToRemove

 * It's relative to ExeFile, which should be the same as in TorBrowser.
---
 projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch 
b/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch
index 4ddb4c0..4501ee7 100644
--- a/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch
+++ b/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch
@@ -947,9 +947,9 @@ index 000..2b0b100
 +  NS_ENSURE_ARG_POINTER(aFile);
 +  nsCOMPtr appRootDir = aExeFile;
 +
-+  int levelsToRemove = 0; // Remove firefox (the executable file).
++  int levelsToRemove = 1; // Remove firefox (the executable file).
 +#if defined(XP_MACOSX)
-+  levelsToRemove += 1;   // On Mac OS, we must also remove Contents/MacOS.
++  levelsToRemove += 2;   // On Mac OS, we must also remove Contents/MacOS.
 +#endif
 +  while (appRootDir && (levelsToRemove > 0)) {
 +// When crawling up the hierarchy, components named "." do not count.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Release version 0.2.0b1

[sukhbir]

commit 2515efa405b59f4d8a00259ec34e1ef442d84d16
Author: Sukhbir Singh 
Date:   Fri Sep 2 12:01:49 2016 -0400

Release version 0.2.0b1
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ace3cbc..1faba19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Tor Messenger 0.2.0b1 -- 
+Tor Messenger 0.2.0b1 -- September 02, 2016
  * All Platforms
* Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45
* Use the THUNDERBIRD_45_3_0_RELEASE tag on comm-esr45



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/updater] Fix OS X build permissions (see #19269)

[sukhbir]

commit ec7a83c5e56f4c31faf212e549a7b41382596de8
Author: Sukhbir Singh 
Date:   Mon Sep 5 20:36:45 2016 -0400

Fix OS X build permissions (see #19269)
---
 projects/tor-messenger/build.osx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index 5013d12..2c8bc83 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -55,11 +55,11 @@ cp $rootdir/background.png .background/
 cp $rootdir/DS_Store .DS_Store
 ln -s /Applications/ .
 
-find . -executable -exec chmod 750 {} \;
-find . ! -executable -exec chmod 640 {} \;
+find . -executable -exec chmod 755 {} \;
+find . ! -executable -exec chmod 644 {} \;
 find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > 
../filelist.txt
 find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> 
../filelist.txt
 
-mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o 
../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 
20 -dir-mode 0750 -new-dir-mode 0750
+mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o 
../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 
20 -dir-mode 0755 -new-dir-mode 0755
 cd ..
 dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Fix OS X build permissions (see #19269)

[sukhbir]

commit ec7a83c5e56f4c31faf212e549a7b41382596de8
Author: Sukhbir Singh 
Date:   Mon Sep 5 20:36:45 2016 -0400

Fix OS X build permissions (see #19269)
---
 projects/tor-messenger/build.osx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index 5013d12..2c8bc83 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -55,11 +55,11 @@ cp $rootdir/background.png .background/
 cp $rootdir/DS_Store .DS_Store
 ln -s /Applications/ .
 
-find . -executable -exec chmod 750 {} \;
-find . ! -executable -exec chmod 640 {} \;
+find . -executable -exec chmod 755 {} \;
+find . ! -executable -exec chmod 644 {} \;
 find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > 
../filelist.txt
 find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> 
../filelist.txt
 
-mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o 
../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 
20 -dir-mode 0750 -new-dir-mode 0750
+mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o 
../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 
20 -dir-mode 0755 -new-dir-mode 0755
 cd ..
 dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

[translation]

commit 1224567015e58864dbefa58849912c27eb0fd7c2
Author: Translation commit bot 
Date:   Mon Sep 5 23:48:22 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 bg/prefs.dtd | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bg/prefs.dtd b/bg/prefs.dtd
index ec0445a..bcb1c0e 100644
--- a/bg/prefs.dtd
+++ b/bg/prefs.dtd
@@ -1,4 +1,6 @@
 
+
+
 
 
 
@@ -10,4 +12,11 @@
 
 
 
-
\ No newline at end of file
+
+
+
+
+
+
+
+
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

[translation]

commit dbd29a59133678d57fe79b5b1a83bb987210c075
Author: Translation commit bot 
Date:   Mon Sep 5 23:48:09 2016 +

Update translations for tor-messenger-prefsdtd
---
 bg/prefs.dtd | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bg/prefs.dtd b/bg/prefs.dtd
index d039c03..bcb1c0e 100644
--- a/bg/prefs.dtd
+++ b/bg/prefs.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 
@@ -13,10 +13,10 @@
 
 
 
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

[translation]

commit 89b87a7994c2ef16896be1ccb63cb219a7b5fbc9
Author: Translation commit bot 
Date:   Mon Sep 5 23:45:21 2016 +

Update translations for https_everywhere
---
 bg/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bg/https-everywhere.dtd b/bg/https-everywhere.dtd
index d086ad1..f37031f 100644
--- a/bg/https-everywhere.dtd
+++ b/bg/https-everywhere.dtd
@@ -20,7 +20,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

[translation]

commit fb53a0883ca5d045d9dd822925e7cc2ee1ba7130
Author: Translation commit bot 
Date:   Mon Sep 5 23:45:26 2016 +

Update translations for https_everywhere_completed
---
 bg/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bg/https-everywhere.dtd b/bg/https-everywhere.dtd
index f631797..f37031f 100644
--- a/bg/https-everywhere.dtd
+++ b/bg/https-everywhere.dtd
@@ -20,7 +20,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Fix levelsToRemove

[arlo]

commit 70c38e1ec0fe72ac4231d2f65f21fd374d5c94a0
Author: Arlo Breault 
Date:   Mon Sep 5 15:34:25 2016 -0700

Fix levelsToRemove

 * It's relative to ExeFile, which should be the same as in TorBrowser.
---
 projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch 
b/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch
index 4ddb4c0..4501ee7 100644
--- a/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch
+++ b/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch
@@ -947,9 +947,9 @@ index 000..2b0b100
 +  NS_ENSURE_ARG_POINTER(aFile);
 +  nsCOMPtr appRootDir = aExeFile;
 +
-+  int levelsToRemove = 0; // Remove firefox (the executable file).
++  int levelsToRemove = 1; // Remove firefox (the executable file).
 +#if defined(XP_MACOSX)
-+  levelsToRemove += 1;   // On Mac OS, we must also remove Contents/MacOS.
++  levelsToRemove += 2;   // On Mac OS, we must also remove Contents/MacOS.
 +#endif
 +  while (appRootDir && (levelsToRemove > 0)) {
 +// When crawling up the hierarchy, components named "." do not count.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Appease make check-spaces

[andrea]

commit 341a159ab4ec9cb0a07a6f3507c4eb5aaf83798a
Author: Andrea Shepard 
Date:   Mon Sep 5 17:47:39 2016 +

Appease make check-spaces
---
 src/or/circuitbuild.c   | 1 +
 src/or/rendservice.c| 1 +
 src/test/log_test_helpers.c | 2 +-
 src/test/test_util.c| 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index aa2b0b2..12c7553 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2547,3 +2547,4 @@ extend_info_has_preferred_onion_key(const extend_info_t* 
ei)
   tor_assert(ei);
   return extend_info_supports_ntor(ei);
 }
+
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 4ad3505..12af748 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3904,3 +3904,4 @@ rend_service_allow_direct_connection(const or_options_t 
*options)
   (void)options;
   return 0;
 }
+
diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c
index 2c99da8..1ad008a 100644
--- a/src/test/log_test_helpers.c
+++ b/src/test/log_test_helpers.c
@@ -145,7 +145,6 @@ mock_saved_log_has_message_containing(const char *msg)
   return 0;
 }
 
-
 /** Return true iff the saved logs have any messages with severity */
 int
 mock_saved_log_has_severity(int severity)
@@ -210,3 +209,4 @@ mock_saving_logv(int severity, log_domain_mask_t domain,
 
   smartlist_add(saved_logs, e);
 }
+
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 445abb9..6839db9 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -2216,7 +2216,6 @@ test_util_gzip_compression_bomb(void *arg)
   size_t result_len = 0;
   tor_zlib_state_t *state = NULL;
 
-
   /* Make sure we can't produce a compression bomb */
   const int prev_level = setup_full_capture_of_logs(LOG_WARN);
   tt_int_op(-1, OP_EQ, tor_gzip_compress(, _len,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix BUG warning with stack trace from config/parse_port_config__listenaddress

[nickm]

commit 6abce601f22789aa4bd5fdf227f9e4ba07406b1c
Author: Nick Mathewson 
Date:   Mon Sep 5 13:30:50 2016 -0400

Fix BUG warning with stack trace from 
config/parse_port_config__listenaddress
---
 src/test/test_config.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 90ea4da..1e6d2ad 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -3832,6 +3832,8 @@ test_config_parse_port_config__listenaddress(void *data)
   tt_int_op(ret, OP_EQ, 0);
 
   // Test warning nonlocal other
+  SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf));
+  smartlist_clear(slout);
   ret = parse_port_config(slout, config_port2, config_listen_address, "DNS",
   0, NULL, 0, CL_PORT_WARN_NONLOCAL);
   tt_int_op(ret, OP_EQ, 0);

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

[translation]

commit 547c352580688f02aa0c31d8eb57568ed05c7faf
Author: Translation commit bot 
Date:   Mon Sep 5 16:45:03 2016 +

Update translations for bridgedb
---
 af/LC_MESSAGES/bridgedb.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/af/LC_MESSAGES/bridgedb.po b/af/LC_MESSAGES/bridgedb.po
index 35b6ced..1df8a0c 100644
--- a/af/LC_MESSAGES/bridgedb.po
+++ b/af/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-09-05 16:14+\n"
+"PO-Revision-Date: 2016-09-05 16:19+\n"
 "Last-Translator: Joziah Cameron \n"
 "Language-Team: Afrikaans 
(http://www.transifex.com/otf/torproject/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -45,23 +45,23 @@ msgstr "bronkode"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
-msgstr ""
+msgstr "Changelog"
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
-msgstr ""
+msgstr "kontak"
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr ""
+msgstr "Kies alles"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr ""
+msgstr "Wys QRKode"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr ""
+msgstr "QRKode vir jou lyne te oorbrug"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
@@ -70,7 +70,7 @@ msgstr ""
 #: bridgedb/https/templates/bridges.html:67
 #: bridgedb/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
-msgstr ""
+msgstr "Uh oh, spaghettios"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

[translation]

commit bc6fd49b97a9cff3b87910ec06860a725fc33dbc
Author: Translation commit bot 
Date:   Mon Sep 5 16:15:05 2016 +

Update translations for bridgedb
---
 af/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/af/LC_MESSAGES/bridgedb.po b/af/LC_MESSAGES/bridgedb.po
index 5dbf0e2..35b6ced 100644
--- a/af/LC_MESSAGES/bridgedb.po
+++ b/af/LC_MESSAGES/bridgedb.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Douglas van Wyngaard , 2015
+# Joziah Cameron , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Douglas van Wyngaard \n"
+"PO-Revision-Date: 2016-09-05 16:14+\n"
+"Last-Translator: Joziah Cameron \n"
 "Language-Team: Afrikaans 
(http://www.transifex.com/otf/torproject/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,11 +37,11 @@ msgstr "Jammer! Iets het verkeerd geloop met jou versoek."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr ""
+msgstr "Rapporteer 'n gogga"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"
-msgstr ""
+msgstr "bronkode"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Bug 20038: Fix typo in ControlPort description

[nickm]

commit d0cdc8d783d248e4aefd3595ca1da5d816885a5f
Author: Georg Koppen 
Date:   Wed Aug 31 10:42:40 2016 +

Bug 20038: Fix typo in ControlPort description
---
 doc/tor.1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 0687991..a0a0bcb 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -321,7 +321,7 @@ GENERAL OPTIONS
 specify one or more of **HashedControlPassword** or
 **CookieAuthentication**, setting this option will cause Tor to allow
 any process on the local host to control it. (Setting both authentication
-methods means eithermethod is sufficient to authenticate to Tor.) This
+methods means either method is sufficient to authenticate to Tor.) This
 option is required for many Tor controllers; most use the value of 9051.
 Set it to "auto" to have Tor pick a port for you. (Default: 0) +
  +

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits