[tor-commits] [chutney/master] Fix a comment typo in test-network.sh

2017-02-28 Thread teor
commit 125b2e61e21c263e705c4c42afcaedb581078a3e
Author: teor 
Date:   Wed Mar 1 12:16:37 2017 +1100

Fix a comment typo in test-network.sh
---
 tools/test-network.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/test-network.sh b/tools/test-network.sh
index 0c8d795..9da20b1 100755
--- a/tools/test-network.sh
+++ b/tools/test-network.sh
@@ -141,7 +141,7 @@ done
 # optional: $TOR_DIR is the tor build directory
 # it's used to find the location of tor binaries
 # if it's not set:
-#  - set it ro $BUILDDIR, or
+#  - set it to $BUILDDIR, or
 #  - if $PWD looks like a tor build directory, set it to $PWD, or
 #  - unset $TOR_DIR, and let chutney fall back to finding tor binaries in $PATH
 if [ ! -d "$TOR_DIR" ]; then

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


[tor-commits] [tor/release-0.3.0] Restore support for test-network.sh on BSD and other systems without bash

2017-02-28 Thread nickm
commit 004ec8dc58078e6f4ab90f603ce3a9df3dd9e065
Author: teor 
Date:   Wed Mar 1 11:21:07 2017 +1100

Restore support for test-network.sh on BSD and other systems without bash

(But use bash if it's available.)
This is a workaround until we remove bash-specific code in 19699.

Fixes bug 21581; bugfix on 21562, not in any released version of tor.
---
 changes/bug21581 |  5 +
 src/test/test-network.sh | 19 ---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/changes/bug21581 b/changes/bug21581
new file mode 100644
index 000..1077719
--- /dev/null
+++ b/changes/bug21581
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+- Restore support for test-network.sh on BSD and other systems without
+  bash. (But use bash if it's available.) This is a workaround until we
+  remove bash-specific code in 19699.
+  Fixes bug 21581; bugfix on 21562, not in any released version of tor.
diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index cb10f72..edd2897 100755
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@ -1,9 +1,19 @@
-#! /bin/bash
+#! /bin/sh
+
+# use bash if it is available, as this script doesn't work well in non-bash sh
+# this will be fixed in #19699
+# there is no simple, portable way of checking the name of the shell, so we
+# exec bash even when sh is bash
+if [ -x /bin/bash -a "$USING_BASH" != true ]; then
+# only do this once
+export USING_BASH=true
+exec /bin/bash "$0" "$@"
+fi
 
 # Please do not modify this script, it has been moved to chutney/tools
 
-export ECHO=${ECHO:-"echo"}
-export ECHO_N=${ECHO_N:-"/bin/echo -n"}
+export ECHO="${ECHO:-echo}"
+export ECHO_N="${ECHO_N:-/bin/echo -n}"
 
 # Output is prefixed with the name of the script
 myname=$(basename $0)
@@ -21,6 +31,8 @@ if [ "$TEST_NETWORK_RECURSING" != true ]; then
 # can be removed, because this script will find chutney, then pass all
 # arguments to chutney's test-network.sh
 export TEST_NETWORK_RECURSING=true
+# passing arguments to a sourced script only works in bash
+# this will be fixed in #19699
 . "$0" --dry-run "$@"
 
 # Call the chutney version of this script, if it exists, and we can find it
@@ -179,6 +191,7 @@ export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR
 if [ "$NETWORK_DRY_RUN" = true ]; then
 # we can't exit here, it breaks argument processing
 # this only works in bash: return semantics are shell-specific
+# this will be fixed in #19699
 return 2>/dev/null || exit
 fi
 



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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-02-28 Thread nickm
commit 909493604072e371d05d622a9ee1554e6cb7313b
Merge: cf9844f a3bec9a
Author: Nick Mathewson 
Date:   Tue Feb 28 20:13:54 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 Makefile.am  |  3 ---
 changes/bug21581 |  5 +
 src/test/test-network.sh | 19 ---
 3 files changed, 21 insertions(+), 6 deletions(-)

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


[tor-commits] [tor/master] Remove a spurious test-network-all warning that triggers when sh is not bash

2017-02-28 Thread nickm
commit a3bec9aa5a023c39f04d863c21cef779cb590e85
Author: teor 
Date:   Wed Mar 1 11:54:31 2017 +1100

Remove a spurious test-network-all warning that triggers when sh is not bash

Part of 21581.
---
 Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 880420b..3d50594 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,9 +137,6 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
$(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
-   if test $$? -eq 2 ; then \
-   echo "Please update your chutney using 'git pull' to 
see tor warnings here."; \
-   fi; \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
! grep -q FAIL test_network_log/*.trs



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


[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug21510'

2017-02-28 Thread nickm
commit 1cd7a697f1ba96898580d4e6c6412bb245f853d1
Merge: aa50758 7a65abf
Author: Nick Mathewson 
Date:   Tue Feb 28 11:43:58 2017 -0500

Merge remote-tracking branch 'teor/bug21510'

 changes/bug21510| 4 
 src/test/log_test_helpers.h | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)



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


[tor-commits] [tor/master] Make display of captured unit test log messages consistent

2017-02-28 Thread nickm
commit 7a65abf566d9a66f2792e9f83480ca42e0574b43
Author: teor 
Date:   Sun Feb 19 23:09:50 2017 +1100

Make display of captured unit test log messages consistent

There was a missing space and an extra colon.

Fixes bug 21510; bugfix on 0.2.9.3-alpha.
---
 changes/bug21510| 4 
 src/test/log_test_helpers.h | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug21510 b/changes/bug21510
new file mode 100644
index 000..31c3e1a
--- /dev/null
+++ b/changes/bug21510
@@ -0,0 +1,4 @@
+  o Minor bugfixes (unit tests):
+- Make display of captured unit test log messages consistent.
+  Fixes bug 21510; bugfix on 0.2.9.3-alpha.
+
diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h
index 922c68b..19c5a88 100644
--- a/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@ -71,14 +71,14 @@ void mock_dump_saved_logs(void);
 \
 assert_log_predicate(mock_saved_log_has_message_containing(str) &&  \
  mock_saved_log_n_entries() == 1,   \
-  "expected log to contain exactly 1 message: " # str); \
+  "expected log to contain exactly 1 message " # str); \
   } while (0);
 
 #define expect_single_log_msg_containing(str) \
   do {  \
 assert_log_predicate(mock_saved_log_has_message_containing(str)&&   \
  mock_saved_log_n_entries() == 1 ,  \
-"expected log to contain 1 message, containing" # str); \
+"expected log to contain 1 message, containing " # str); \
   } while (0);
 
 #define expect_no_log_msg(str) \



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


[tor-commits] [tor/maint-0.3.0] Remove a spurious test-network-all warning that triggers when sh is not bash

2017-02-28 Thread nickm
commit a3bec9aa5a023c39f04d863c21cef779cb590e85
Author: teor 
Date:   Wed Mar 1 11:54:31 2017 +1100

Remove a spurious test-network-all warning that triggers when sh is not bash

Part of 21581.
---
 Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 880420b..3d50594 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,9 +137,6 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
$(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
-   if test $$? -eq 2 ; then \
-   echo "Please update your chutney using 'git pull' to 
see tor warnings here."; \
-   fi; \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
! grep -q FAIL test_network_log/*.trs

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


[tor-commits] [tor/maint-0.3.0] Restore support for test-network.sh on BSD and other systems without bash

2017-02-28 Thread nickm
commit 004ec8dc58078e6f4ab90f603ce3a9df3dd9e065
Author: teor 
Date:   Wed Mar 1 11:21:07 2017 +1100

Restore support for test-network.sh on BSD and other systems without bash

(But use bash if it's available.)
This is a workaround until we remove bash-specific code in 19699.

Fixes bug 21581; bugfix on 21562, not in any released version of tor.
---
 changes/bug21581 |  5 +
 src/test/test-network.sh | 19 ---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/changes/bug21581 b/changes/bug21581
new file mode 100644
index 000..1077719
--- /dev/null
+++ b/changes/bug21581
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+- Restore support for test-network.sh on BSD and other systems without
+  bash. (But use bash if it's available.) This is a workaround until we
+  remove bash-specific code in 19699.
+  Fixes bug 21581; bugfix on 21562, not in any released version of tor.
diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index cb10f72..edd2897 100755
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@ -1,9 +1,19 @@
-#! /bin/bash
+#! /bin/sh
+
+# use bash if it is available, as this script doesn't work well in non-bash sh
+# this will be fixed in #19699
+# there is no simple, portable way of checking the name of the shell, so we
+# exec bash even when sh is bash
+if [ -x /bin/bash -a "$USING_BASH" != true ]; then
+# only do this once
+export USING_BASH=true
+exec /bin/bash "$0" "$@"
+fi
 
 # Please do not modify this script, it has been moved to chutney/tools
 
-export ECHO=${ECHO:-"echo"}
-export ECHO_N=${ECHO_N:-"/bin/echo -n"}
+export ECHO="${ECHO:-echo}"
+export ECHO_N="${ECHO_N:-/bin/echo -n}"
 
 # Output is prefixed with the name of the script
 myname=$(basename $0)
@@ -21,6 +31,8 @@ if [ "$TEST_NETWORK_RECURSING" != true ]; then
 # can be removed, because this script will find chutney, then pass all
 # arguments to chutney's test-network.sh
 export TEST_NETWORK_RECURSING=true
+# passing arguments to a sourced script only works in bash
+# this will be fixed in #19699
 . "$0" --dry-run "$@"
 
 # Call the chutney version of this script, if it exists, and we can find it
@@ -179,6 +191,7 @@ export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR
 if [ "$NETWORK_DRY_RUN" = true ]; then
 # we can't exit here, it breaks argument processing
 # this only works in bash: return semantics are shell-specific
+# this will be fixed in #19699
 return 2>/dev/null || exit
 fi
 



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


[tor-commits] [tor/release-0.3.0] Remove a spurious test-network-all warning that triggers when sh is not bash

2017-02-28 Thread nickm
commit a3bec9aa5a023c39f04d863c21cef779cb590e85
Author: teor 
Date:   Wed Mar 1 11:54:31 2017 +1100

Remove a spurious test-network-all warning that triggers when sh is not bash

Part of 21581.
---
 Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 880420b..3d50594 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,9 +137,6 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
$(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
-   if test $$? -eq 2 ; then \
-   echo "Please update your chutney using 'git pull' to 
see tor warnings here."; \
-   fi; \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
! grep -q FAIL test_network_log/*.trs



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


[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

2017-02-28 Thread nickm
commit 8e3d929df7c497c83c2f34aae9fd9c88545072d3
Merge: 1cd7a69 a3bec9a
Author: Nick Mathewson 
Date:   Tue Feb 28 20:14:06 2017 -0500

Merge branch 'maint-0.3.0'

 Makefile.am  |  3 ---
 changes/bug21581 |  5 +
 src/test/test-network.sh | 19 ---
 3 files changed, 21 insertions(+), 6 deletions(-)

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


[tor-commits] [tor/master] Restore support for test-network.sh on BSD and other systems without bash

2017-02-28 Thread nickm
commit 004ec8dc58078e6f4ab90f603ce3a9df3dd9e065
Author: teor 
Date:   Wed Mar 1 11:21:07 2017 +1100

Restore support for test-network.sh on BSD and other systems without bash

(But use bash if it's available.)
This is a workaround until we remove bash-specific code in 19699.

Fixes bug 21581; bugfix on 21562, not in any released version of tor.
---
 changes/bug21581 |  5 +
 src/test/test-network.sh | 19 ---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/changes/bug21581 b/changes/bug21581
new file mode 100644
index 000..1077719
--- /dev/null
+++ b/changes/bug21581
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+- Restore support for test-network.sh on BSD and other systems without
+  bash. (But use bash if it's available.) This is a workaround until we
+  remove bash-specific code in 19699.
+  Fixes bug 21581; bugfix on 21562, not in any released version of tor.
diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index cb10f72..edd2897 100755
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@ -1,9 +1,19 @@
-#! /bin/bash
+#! /bin/sh
+
+# use bash if it is available, as this script doesn't work well in non-bash sh
+# this will be fixed in #19699
+# there is no simple, portable way of checking the name of the shell, so we
+# exec bash even when sh is bash
+if [ -x /bin/bash -a "$USING_BASH" != true ]; then
+# only do this once
+export USING_BASH=true
+exec /bin/bash "$0" "$@"
+fi
 
 # Please do not modify this script, it has been moved to chutney/tools
 
-export ECHO=${ECHO:-"echo"}
-export ECHO_N=${ECHO_N:-"/bin/echo -n"}
+export ECHO="${ECHO:-echo}"
+export ECHO_N="${ECHO_N:-/bin/echo -n}"
 
 # Output is prefixed with the name of the script
 myname=$(basename $0)
@@ -21,6 +31,8 @@ if [ "$TEST_NETWORK_RECURSING" != true ]; then
 # can be removed, because this script will find chutney, then pass all
 # arguments to chutney's test-network.sh
 export TEST_NETWORK_RECURSING=true
+# passing arguments to a sourced script only works in bash
+# this will be fixed in #19699
 . "$0" --dry-run "$@"
 
 # Call the chutney version of this script, if it exists, and we can find it
@@ -179,6 +191,7 @@ export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR
 if [ "$NETWORK_DRY_RUN" = true ]; then
 # we can't exit here, it breaks argument processing
 # this only works in bash: return semantics are shell-specific
+# this will be fixed in #19699
 return 2>/dev/null || exit
 fi
 



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


[tor-commits] [chutney/master] Use sh rather than bash

2017-02-28 Thread teor
commit 030e2b98173e2177666957abbb2750830e758b12
Author: teor 
Date:   Wed Mar 1 11:05:05 2017 +1100

Use sh rather than bash

And fix some bash-isms.
This restores support for BSDs without bash installed.

Reverts 0d57f92.
Closes 21575.
---
 chutney|  2 +-
 tools/bootstrap-network.sh |  2 +-
 tools/hsaddress.sh |  9 -
 tools/test-network.sh  | 10 +-
 tools/warnings.sh  |  6 +++---
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/chutney b/chutney
index 0d4b391..f231e66 100755
--- a/chutney
+++ b/chutney
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 set -o errexit
 set -o nounset
diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh
index 7fb2eed..49afbd8 100755
--- a/tools/bootstrap-network.sh
+++ b/tools/bootstrap-network.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 # 1. potentially stop running network
 # 2. bootstrap a network from scratch as quickly as possible
diff --git a/tools/hsaddress.sh b/tools/hsaddress.sh
index 517c6b5..00645d7 100755
--- a/tools/hsaddress.sh
+++ b/tools/hsaddress.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 # Usage:
 #tools/hsaddress.sh [hs_node]
@@ -31,12 +31,12 @@ NAME=$(basename "$0")
 DEST="$CHUTNEY_DATA_DIR/nodes"
 TARGET=hidden_service/hostname
 
-function usage() {
+usage() {
 echo "Usage: $NAME [hs_node]"
 exit 1
 }
 
-function show_address() {
+show_address() {
 cat "$1"
 }
 
@@ -54,8 +54,7 @@ then
 elif [ $# -eq 1 ];
 then
 [ -d "$DEST/$1" ] || { echo "$NAME: $1 not found"; exit 1; }
-# support hOLD
-[[ "$1" =~ .*h.* ]] || { echo "$NAME: $1 is not a HS"; exit 1; }
+# we don't check the name of the HS directory, because tags vary
 FILE="$DEST/$1/$TARGET"
 [ -e "$FILE" ] || { echo "$NAME: $FILE not found"; exit 1; }
 show_address "$FILE"
diff --git a/tools/test-network.sh b/tools/test-network.sh
index bf04dd5..0c8d795 100755
--- a/tools/test-network.sh
+++ b/tools/test-network.sh
@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-export ECHO=${ECHO:-"echo"}
+export ECHO="${ECHO:-echo}"
 
 # Output is prefixed with the name of the script
 myname=$(basename "$0")
@@ -246,9 +246,9 @@ if [ "$NETWORK_DRY_RUN" = true -o "$CHUTNEY_WARNINGS_ONLY" 
= true ]; then
 if [ "$CHUTNEY_WARNINGS_ONLY" = true ]; then
 "$WARNINGS"
 fi
-# we can't exit here, it breaks argument processing
-# this only works in bash: return semantics are shell-specific
-return 2>/dev/null || exit
+# This breaks sourcing this script: that is intentional, as the previous
+# behaviour only worked with bash as /bin/sh
+exit
 fi
 
 "$CHUTNEY_PATH/tools/bootstrap-network.sh" "$NETWORK_FLAVOUR" || exit 3
diff --git a/tools/warnings.sh b/tools/warnings.sh
index da17eda..109032b 100755
--- a/tools/warnings.sh
+++ b/tools/warnings.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 # Usage:
 #tools/warnings.sh [node]
@@ -31,7 +31,7 @@ if [ -d "$PWD/$CHUTNEY_DATA_DIR" ]; then
 export CHUTNEY_DATA_DIR="$PWD/$CHUTNEY_DATA_DIR"
 fi
 
-function show_warnings() {
+show_warnings() {
 # Work out the file and filter settings
 if [ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then
 FILE="$1/*/$LOG_FILE"
@@ -75,7 +75,7 @@ function show_warnings() {
 fi
 }
 
-function usage() {
+usage() {
 echo "Usage: $NAME [node]"
 exit 1
 }



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


[tor-commits] [chutney/master] Produce a sensible output from warnings.sh if readlink is not available

2017-02-28 Thread teor
commit fda220c48f12b7e6578bad07df2e8b0d374de4d0
Author: teor 
Date:   Wed Mar 1 11:14:58 2017 +1100

Produce a sensible output from warnings.sh if readlink is not available
---
 tools/warnings.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/warnings.sh b/tools/warnings.sh
index 109032b..4ef91ee 100755
--- a/tools/warnings.sh
+++ b/tools/warnings.sh
@@ -63,7 +63,7 @@ show_warnings() {
 fi
 if [ "$CHUTNEY_WARNINGS_IGNORE_EXPECTED" = true -a \
 -e "$IGNORE_FILE" ]; then
-PERMANENT_DIR=`readlink -n "$1"`
+PERMANENT_DIR=`readlink -n "$1" || echo "$1"`
 $ECHO_A "${GREEN}Detail: chutney/tools/warnings.sh $PERMANENT_DIR${NC}"
 fi
 # Display the warnings, after filtering and counting occurrences

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


[tor-commits] [tor/master] Reject versions that have non-numeric prefixes

2017-02-28 Thread nickm
commit 590bfe3d6df3c2cdcd8acde7444ec1a8e9ac8344
Author: teor 
Date:   Sun Feb 19 22:47:47 2017 +1100

Reject versions that have non-numeric prefixes

Unit tests #21507.
Part of #21470.
---
 src/test/test_dir.c | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index d3ec9be..696d61c 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -1123,6 +1123,16 @@ test_dir_versions(void *arg)
   tt_int_op(-1, OP_EQ, tor_version_parse("0.-1.0", ));
   tt_int_op(-1, OP_EQ, tor_version_parse("0.-2147483648.0", ));
   tt_int_op(-1, OP_EQ, tor_version_parse("0.-4294967295.0", ));
+  /* In #21507, we reject version components with non-numeric prefixes */
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.-0.0", ));
+  tt_int_op(-1, OP_EQ, tor_version_parse("+1.0.0", ));
+  /* use the list in isspace() */
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.\t0.0", ));
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.\n0.0", ));
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.\v0.0", ));
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.\f0.0", ));
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.\r0.0", ));
+  tt_int_op(-1, OP_EQ, tor_version_parse("0. 0.0", ));
 
 #define tt_versionstatus_op(vs1, op, vs2)   \
   tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t,   \



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


[tor-commits] [tor/master] Add unit tests that ensure out of range versions are rejected

2017-02-28 Thread nickm
commit 6d0b1a89971e1ee104ab758cb6aabeab70a7ffd9
Author: teor 
Date:   Sun Feb 19 22:46:42 2017 +1100

Add unit tests that ensure out of range versions are rejected

Unit tests for #21278.
Part of #21470.
---
 src/test/test_dir.c | 43 ++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index d72977d..d3ec9be 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -1119,6 +1119,10 @@ test_dir_versions(void *arg)
   tt_str_op("", OP_EQ, ver1.status_tag);
   tt_int_op(-1, OP_EQ, tor_version_parse("0.2147483648.0", ));
   tt_int_op(-1, OP_EQ, tor_version_parse("0.4294967295.0", ));
+  /* In #21278, we reject negative version components */
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.-1.0", ));
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.-2147483648.0", ));
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.-4294967295.0", ));
 
 #define tt_versionstatus_op(vs1, op, vs2)   \
   tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t,   \
@@ -1204,6 +1208,43 @@ test_dir_versions(void *arg)
   tt_int_op(0,OP_EQ, tor_version_as_new_as(
"Tor 0.2.9.9 (git-00)",
"Tor 0.2.9.9 (git-01)"));
+  /* In #21278, we comapre without integer overflows.
+   * But since #21450 limits version components to [0, INT32_MAX], it is no
+   * longer possible to cause an integer overflow in tor_version_compare() */
+  tt_int_op(0,OP_EQ, tor_version_as_new_as(
+   "Tor 0.0.0.0",
+   "Tor 2147483647.0.0.0"));
+  tt_int_op(1,OP_EQ, tor_version_as_new_as(
+   "Tor 2147483647.0.0.0",
+   "Tor 0.0.0.0"));
+  /* These versions used to cause an overflow, now they don't parse
+   * (and authorities reject their descriptors), and log a BUG message */
+  setup_full_capture_of_logs(LOG_WARN);
+  tt_int_op(0,OP_EQ, tor_version_as_new_as(
+   "Tor 0.0.0.0",
+   "Tor 0.-2147483648.0.0"));
+  expect_single_log_msg_containing("unparseable");
+  mock_clean_saved_logs();
+  tt_int_op(0,OP_EQ, tor_version_as_new_as(
+   "Tor 0.2147483647.0.0",
+   "Tor 0.-1.0.0"));
+  expect_single_log_msg_containing("unparseable");
+  mock_clean_saved_logs();
+  tt_int_op(0,OP_EQ, tor_version_as_new_as(
+   "Tor 0.2147483647.0.0",
+   "Tor 0.-2147483648.0.0"));
+  expect_single_log_msg_containing("unparseable");
+  mock_clean_saved_logs();
+  tt_int_op(1,OP_EQ, tor_version_as_new_as(
+   "Tor 4294967295.0.0.0",
+   "Tor 0.0.0.0"));
+  expect_no_log_entry();
+  tt_int_op(0,OP_EQ, tor_version_as_new_as(
+   "Tor 0.4294967295.0.0",
+   "Tor 0.-4294967295.0.0"));
+  expect_single_log_msg_containing("unparseable");
+  mock_clean_saved_logs();
+  teardown_capture_of_logs();
 
   /* Now try git revisions */
   tt_int_op(0,OP_EQ, tor_version_parse("0.5.6.7 (git-ff00ff)", ));
@@ -1230,7 +1271,7 @@ test_dir_versions(void *arg)
 "0.5.6.7 (git-000102030405060708090a0b0c0d0e0f1011121314)",
 ));
  done:
-  ;
+  teardown_capture_of_logs();
 }
 
 /** Run unit tests for directory fp_pair functions. */



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


[tor-commits] [tor/master] Add unit tests for the current range of tor version status tags

2017-02-28 Thread nickm
commit 3c39dab4333647a0ac331d912df209cdd144211d
Author: teor 
Date:   Sun Feb 19 22:42:44 2017 +1100

Add unit tests for the current range of tor version status tags

Related to #21470.
---
 src/test/test_dir.c | 30 ++
 1 file changed, 30 insertions(+)

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index cdc56ac..cc95f5b 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -1064,6 +1064,7 @@ test_dir_versions(void *arg)
   tt_int_op(0, OP_EQ, ver1.patchlevel);
   tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
   tt_str_op("alpha", OP_EQ, ver1.status_tag);
+  /* Go through the full set of status tags */
   tt_int_op(0, OP_EQ, tor_version_parse("2.1.700-alpha", ));
   tt_int_op(2, OP_EQ, ver1.major);
   tt_int_op(1, OP_EQ, ver1.minor);
@@ -1078,6 +1079,34 @@ test_dir_versions(void *arg)
   tt_int_op(0, OP_EQ, ver1.patchlevel);
   tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
   tt_str_op("alpha-dev", OP_EQ, ver1.status_tag);
+  tt_int_op(0, OP_EQ, tor_version_parse("0.2.9.5-rc", ));
+  tt_int_op(0, OP_EQ, ver1.major);
+  tt_int_op(2, OP_EQ, ver1.minor);
+  tt_int_op(9, OP_EQ, ver1.micro);
+  tt_int_op(5, OP_EQ, ver1.patchlevel);
+  tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
+  tt_str_op("rc", OP_EQ, ver1.status_tag);
+  tt_int_op(0, OP_EQ, tor_version_parse("0.2.9.6-rc-dev", ));
+  tt_int_op(0, OP_EQ, ver1.major);
+  tt_int_op(2, OP_EQ, ver1.minor);
+  tt_int_op(9, OP_EQ, ver1.micro);
+  tt_int_op(6, OP_EQ, ver1.patchlevel);
+  tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
+  tt_str_op("rc-dev", OP_EQ, ver1.status_tag);
+  tt_int_op(0, OP_EQ, tor_version_parse("0.2.9.8", ));
+  tt_int_op(0, OP_EQ, ver1.major);
+  tt_int_op(2, OP_EQ, ver1.minor);
+  tt_int_op(9, OP_EQ, ver1.micro);
+  tt_int_op(8, OP_EQ, ver1.patchlevel);
+  tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
+  tt_str_op("", OP_EQ, ver1.status_tag);
+  tt_int_op(0, OP_EQ, tor_version_parse("0.2.9.9-dev", ));
+  tt_int_op(0, OP_EQ, ver1.major);
+  tt_int_op(2, OP_EQ, ver1.minor);
+  tt_int_op(9, OP_EQ, ver1.micro);
+  tt_int_op(9, OP_EQ, ver1.patchlevel);
+  tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
+  tt_str_op("dev", OP_EQ, ver1.status_tag);
 
 #define tt_versionstatus_op(vs1, op, vs2)   \
   tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t,   \
@@ -1097,6 +1126,7 @@ test_dir_versions(void *arg)
   test_v_i_o(VS_RECOMMENDED, "0.0.7rc2", "0.0.7,Tor 0.0.7rc2,Tor 0.0.8");
   test_v_i_o(VS_OLD, "0.0.5.0", "0.0.5.1-cvs");
   test_v_i_o(VS_NEW_IN_SERIES, "0.0.5.1-cvs", "0.0.5, 0.0.6");
+  test_v_i_o(VS_NEW, "0.2.9.9-dev", "0.2.9.9");
   /* Not on list, but newer than any in same series. */
   test_v_i_o(VS_NEW_IN_SERIES, "0.1.0.3",
  "Tor 0.1.0.2,Tor 0.0.9.5,Tor 0.1.1.0");



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


[tor-commits] [tor/master] Changes file for 21470

2017-02-28 Thread nickm
commit 2c45e58bf1128af742d9d12800e969136d21320d
Author: teor 
Date:   Sun Feb 19 22:51:50 2017 +1100

Changes file for 21470
---
 changes/test21470 | 5 +
 1 file changed, 5 insertions(+)

diff --git a/changes/test21470 b/changes/test21470
new file mode 100644
index 000..8bb78df
--- /dev/null
+++ b/changes/test21470
@@ -0,0 +1,5 @@
+  o Minor enhancements (unit tests):
+- Improve version parsing tests: add tests for typical version components,
+  add tests for invalid versions, including numeric range and non-numeric
+  prefixes.
+  Unit tests 21278, 21450, and 21507. Partially implements 21470.



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


[tor-commits] [tor/master] Add unit tests for version parsing integer size inconsistencies

2017-02-28 Thread nickm
commit b3e139581ba7918668bd32bd7ef64a16eff2b9d2
Author: teor 
Date:   Sun Feb 19 22:45:25 2017 +1100

Add unit tests for version parsing integer size inconsistencies

Unit tests for #21450.
Part of #21470.
---
 src/test/test_dir.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index a16aa2f..d72977d 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -1107,6 +1107,18 @@ test_dir_versions(void *arg)
   tt_int_op(9, OP_EQ, ver1.patchlevel);
   tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
   tt_str_op("dev", OP_EQ, ver1.status_tag);
+  /* In #21450, we fixed an inconsistency in parsing versions > INT32_MAX
+   * between i386 and x86_64, as we used tor_parse_long, and then cast to int
+   */
+  tt_int_op(0, OP_EQ, tor_version_parse("0.2147483647.0", ));
+  tt_int_op(0, OP_EQ, ver1.major);
+  tt_int_op(2147483647, OP_EQ, ver1.minor);
+  tt_int_op(0, OP_EQ, ver1.micro);
+  tt_int_op(0, OP_EQ, ver1.patchlevel);
+  tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
+  tt_str_op("", OP_EQ, ver1.status_tag);
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.2147483648.0", ));
+  tt_int_op(-1, OP_EQ, tor_version_parse("0.4294967295.0", ));
 
 #define tt_versionstatus_op(vs1, op, vs2)   \
   tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t,   \



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


[tor-commits] [tor/master] Merge remote-tracking branch 'teor/test21470-029'

2017-02-28 Thread nickm
commit aa50758777ed4370f07e45a082dbeaa8c94620da
Merge: ef61046 2c45e58
Author: Nick Mathewson 
Date:   Tue Feb 28 11:31:07 2017 -0500

Merge remote-tracking branch 'teor/test21470-029'

 changes/test21470   |   5 ++
 src/test/test_dir.c | 135 +++-
 2 files changed, 139 insertions(+), 1 deletion(-)

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


[tor-commits] [tor/master] Add unit tests for current tor version git tags

2017-02-28 Thread nickm
commit e34a209df1652be5f15083ff8d6e44316fe1a599
Author: teor 
Date:   Sun Feb 19 22:44:07 2017 +1100

Add unit tests for current tor version git tags

Related to #21470
---
 src/test/test_dir.c | 40 
 1 file changed, 40 insertions(+)

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index cc95f5b..a16aa2f 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -1165,6 +1165,33 @@ test_dir_versions(void *arg)
"Tor 0.2.1.0-dev (r99)"));
   tt_int_op(1,OP_EQ, tor_version_as_new_as("Tor 0.2.1.1",
"Tor 0.2.1.0-dev (r99)"));
+  /* And git revisions */
+  tt_int_op(1,OP_EQ, tor_version_as_new_as(
+"Tor 0.2.9.9 (git-56788a2489127072)",
+"Tor 0.2.9.9 (git-56788a2489127072)"));
+  /* a git revision is newer than no git revision */
+  tt_int_op(1,OP_EQ, tor_version_as_new_as(
+"Tor 0.2.9.9 (git-56788a2489127072)",
+"Tor 0.2.9.9"));
+  /* a longer git revision is newer than a shorter git revision
+   * this should be true if they prefix-match, but if they don't, they are
+   * incomparable, because hashes aren't ordered (but we compare their bytes
+   * anyway) */
+  tt_int_op(1,OP_EQ, tor_version_as_new_as(
+  "Tor 0.2.9.9 (git-56788a2489127072d513cf4baf35a8ff475f3c7b)",
+  "Tor 0.2.9.9 (git-56788a2489127072)"));
+  tt_int_op(1,OP_EQ, tor_version_as_new_as(
+"Tor 0.2.9.9 (git-0102)",
+"Tor 0.2.9.9 (git-03)"));
+  tt_int_op(1,OP_EQ, tor_version_as_new_as(
+"Tor 0.2.9.9 (git-0102)",
+"Tor 0.2.9.9 (git-00)"));
+  tt_int_op(1,OP_EQ, tor_version_as_new_as(
+   "Tor 0.2.9.9 (git-01)",
+   "Tor 0.2.9.9 (git-00)"));
+  tt_int_op(0,OP_EQ, tor_version_as_new_as(
+   "Tor 0.2.9.9 (git-00)",
+   "Tor 0.2.9.9 (git-01)"));
 
   /* Now try git revisions */
   tt_int_op(0,OP_EQ, tor_version_parse("0.5.6.7 (git-ff00ff)", ));
@@ -1174,9 +1201,22 @@ test_dir_versions(void *arg)
   tt_int_op(7,OP_EQ, ver1.patchlevel);
   tt_int_op(3,OP_EQ, ver1.git_tag_len);
   tt_mem_op(ver1.git_tag,OP_EQ, "\xff\x00\xff", 3);
+  /* reject bad hex digits */
   tt_int_op(-1,OP_EQ, tor_version_parse("0.5.6.7 (git-ff00xx)", ));
+  /* reject odd hex digit count */
   tt_int_op(-1,OP_EQ, tor_version_parse("0.5.6.7 (git-ff00fff)", ));
+  /* ignore "git " */
   tt_int_op(0,OP_EQ, tor_version_parse("0.5.6.7 (git ff00fff)", ));
+  /* standard length is 16 hex digits */
+  tt_int_op(0,OP_EQ, tor_version_parse("0.5.6.7 (git-0010203040506070)",
+   ));
+  /* length limit is 40 hex digits */
+  tt_int_op(0,OP_EQ, tor_version_parse(
+ "0.5.6.7 (git-000102030405060708090a0b0c0d0e0f10111213)",
+ ));
+  tt_int_op(-1,OP_EQ, tor_version_parse(
+"0.5.6.7 (git-000102030405060708090a0b0c0d0e0f1011121314)",
+));
  done:
   ;
 }



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


[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm
commit ff174995f07747628ad1e71fd344fc27e88a70ed
Merge: fbaee1b 5d45a26
Author: Nick Mathewson 
Date:   Wed Oct 21 11:06:47 2015 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug17398|  3 +++
 changes/bug17401|  3 +++
 changes/bug17402|  3 +++
 src/common/crypto_ed25519.c |  1 +
 src/or/rendcache.c  | 24 
 5 files changed, 26 insertions(+), 8 deletions(-)



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


[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug21507-029'

2017-02-28 Thread nickm
commit ef610467fa5122740cb7a964376a440f31c41696
Merge: 242f9b3 57154e7
Author: Nick Mathewson 
Date:   Tue Feb 28 11:19:24 2017 -0500

Merge remote-tracking branch 'teor/bug21507-029'

 changes/bug21507 | 5 +
 src/or/routerparse.c | 2 ++
 2 files changed, 7 insertions(+)

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


[tor-commits] [tor/master] Reject Tor versions that contain non-numeric prefixes

2017-02-28 Thread nickm
commit 57154e71aa3b0ff205f2700e97f0ffe4531e1330
Author: teor 
Date:   Sun Feb 19 22:38:06 2017 +1100

Reject Tor versions that contain non-numeric prefixes

strto* and _atoi64 accept +, -, and various whitespace before numeric
characters. And permitted whitespace is different between POSIX and Windows.

Fixes bug 21507 and part of 21508; bugfix on 0.0.8pre1.
---
 changes/bug21507 | 5 +
 src/or/routerparse.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/changes/bug21507 b/changes/bug21507
new file mode 100644
index 000..f83e291
--- /dev/null
+++ b/changes/bug21507
@@ -0,0 +1,5 @@
+  o Minor bugfixes (voting consistency):
+- Reject version numbers with non-numeric prefixes (such as +, -, and
+  whitespace). Disallowing whitespace prevents differential version
+  parsing between POSIX-based and Windows platforms.
+  Fixes bug 21507 and part of 21508; bugfix on 0.0.8pre1.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 2ee0d27..521e237 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -5621,6 +5621,8 @@ tor_version_parse(const char *s, tor_version_t *out)
 
 #define NUMBER(m)   \
   do {  \
+if (!cp || *cp < '0' || *cp > '9')  \
+  return -1;\
 out->m = (int)tor_parse_uint64(cp, 10, 0, INT32_MAX, , );\
 if (!ok)\
   return -1;\



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


[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-02-28 Thread translation
commit 61b7ef9ee84a6ce7dfd9cda2e8bb5975bc2f1a51
Author: Translation commit bot 
Date:   Tue Feb 28 16:18:33 2017 +

Update translations for tor-browser-manual
---
 pt/pt.po | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pt/pt.po b/pt/pt.po
index 24a27e5..f03ced8 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -239,7 +239,7 @@ msgstr ""
 
 #: circumvention.page:22
 msgid "Using pluggable transports"
-msgstr ""
+msgstr "A utilizar transportes ligáveis"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -291,6 +291,8 @@ msgid ""
 "Select “Connect with provided bridges”. Tor Browser currently has six "
 "pluggable transport options to choose from."
 msgstr ""
+"Selecione “Ligar com pontes fornecidas”. O Tor Browser tem atualmente 
seis "
+"opções de transporte ligáveis para escolher."
 
 #: circumvention.page:60
 msgid "Which transport should I use?"
@@ -1418,12 +1420,16 @@ msgid ""
 "external ref='media/updating/update1.png' "
 "md5='9ff01eb653d92124746fc31efde2bf07'"
 msgstr ""
+"ref. externa='media/updating/update1.png' "
+"md5='9ff01eb653d92124746fc31efde2bf07'"
 
 #: updating.page:32
 msgid ""
 "When you are prompted to update Tor Browser, click on the Torbutton icon, "
 "then select “Check for Tor Browser Update”."
 msgstr ""
+"Quando lhe é pedido para atualizar o Tor Browser, clique no ícone 
Torbutton,"
+" depois selecione “Procurar por Atualização do Tor Browser”."
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to

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


[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug21407'

2017-02-28 Thread nickm
commit 242f9b3ffb6c100de5b9eb2cbccecbf07c68554f
Merge: 9ec08f9 d004b92
Author: Nick Mathewson 
Date:   Tue Feb 28 11:17:30 2017 -0500

Merge remote-tracking branch 'public/bug21407'

 changes/bug21407  | 4 
 src/or/circuitbuild.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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


[tor-commits] [tor/master] The UseCreateFast consensus parameter now defaults to 0.

2017-02-28 Thread nickm
commit d004b9222e6f07f01666aa2de852fc19e9096a08
Author: Nick Mathewson 
Date:   Thu Feb 16 15:30:26 2017 -0500

The UseCreateFast consensus parameter now defaults to 0.

You can still override it with FastFirstHopPK.  But that's
deprecated.

Closes ticket 21407.
---
 changes/bug21407  | 4 
 src/or/circuitbuild.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug21407 b/changes/bug21407
new file mode 100644
index 000..8d0d917
--- /dev/null
+++ b/changes/bug21407
@@ -0,0 +1,4 @@
+  o Minor features (defaults, security):
+- The default value for UseCreateFast is now 0: clients which haven't yet
+  received a consensus document will nonetheless use a proper handshake
+  to talk to their directory servers (when they can). Closes ticket 21407.
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index cd00034..d688172 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -819,7 +819,7 @@ should_use_create_fast_for_circuit(origin_circuit_t *circ)
   }
   if (options->FastFirstHopPK == -1) {
 /* option is "auto", so look at the consensus. */
-return networkstatus_get_param(NULL, "usecreatefast", 1, 0, 1);
+return networkstatus_get_param(NULL, "usecreatefast", 0, 0, 1);
   }
 
   return options->FastFirstHopPK;



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


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

2017-02-28 Thread translation
commit b3fb0a0c85eafd9c8eb2ead0bce5cc8b9d8bd9b8
Author: Translation commit bot 
Date:   Tue Feb 28 16:17:07 2017 +

Update translations for tor_animation
---
 pt.srt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt.srt b/pt.srt
index 97bf641..8ae1249 100644
--- a/pt.srt
+++ b/pt.srt
@@ -139,8 +139,8 @@ não irão saber quem você é,
 
 30
 00:01:47,540 --> 00:01:49,760
-nga cila pjesë e botës
-ju jeni duke i vizituar,
+de que parte do mundo
+é que está a visitá-los,
 
 31
 00:01:49,920 --> 00:01:51,920

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


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

2017-02-28 Thread translation
commit ffdcfd3eb57ab8f46d6a5d15bcfefc26463c42ca
Author: Translation commit bot 
Date:   Tue Feb 28 16:17:11 2017 +

Update translations for tor_animation_completed
---
 pt.srt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt.srt b/pt.srt
index 97bf641..8ae1249 100644
--- a/pt.srt
+++ b/pt.srt
@@ -139,8 +139,8 @@ não irão saber quem você é,
 
 30
 00:01:47,540 --> 00:01:49,760
-nga cila pjesë e botës
-ju jeni duke i vizituar,
+de que parte do mundo
+é que está a visitá-los,
 
 31
 00:01:49,920 --> 00:01:51,920

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


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2017-02-28 Thread translation
commit 26b69ae42f91b995e34a96ceaa2ba9415909e904
Author: Translation commit bot 
Date:   Tue Feb 28 16:16:22 2017 +

Update translations for tails-misc
---
 pt.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt.po b/pt.po
index 6950f8e..685327d 100644
--- a/pt.po
+++ b/pt.po
@@ -24,7 +24,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-23 11:32+0100\n"
-"PO-Revision-Date: 2017-02-28 14:59+\n"
+"PO-Revision-Date: 2017-02-28 16:06+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -340,7 +340,7 @@ msgstr "I2P não conseguiu iniciar."
 msgid ""
 "Something went wrong when I2P was starting. Check the logs in /var/log/i2p "
 "for more information."
-msgstr "Algo correu mal quando o I2P estava a iniciar. Veja os diários em 
/var/log/i2p para mais informação,"
+msgstr "Ocorreu algo de mal quando o I2P estava a iniciar. Consulte os 
registos em /var/log/i2p para mais informação."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:52
 msgid "I2P's router console is ready"
@@ -359,7 +359,7 @@ msgid ""
 "Eepsite tunnel not built within six minutes. Check the router console in the"
 " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to "
 "the network to try again."
-msgstr "Túnel Eepsite não foi estabelecido em menos de seis minutos. 
Verifique a consola do router no Navegador I2P ou os registos em /var/log/i2p 
para mais informações.\nReconecte-se à rede para tentar novamente."
+msgstr "Túnel Eepsite não foi estabelecido dentro dos seis minutos. 
Verifique a consola do router no Navegador I2P ou os registos em /var/log/i2p 
para mais informação.\nReligue à rede para tentar novamente."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:71
 msgid "I2P is ready"

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


[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2017-02-28 Thread translation
commit 76e5cd7c7696f58129e04793a1d788ccdee3f1d0
Author: Translation commit bot 
Date:   Tue Feb 28 16:16:45 2017 +

Update translations for torbutton-torbuttonproperties
---
 pt/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt/torbutton.properties b/pt/torbutton.properties
index 18525f7..838fb72 100644
--- a/pt/torbutton.properties
+++ b/pt/torbutton.properties
@@ -21,7 +21,7 @@ torbutton.popup.dontask = A partir de agora, transferir 
automaticamente os fiche
 torbutton.popup.prompted_language = Para lhe fornecer maior privacidade, o 
Torbutton pode requerer o uso da versão em inglês em páginas da Internet. 
Isto pode causar a visualização em inglês das páginas que prefere ler em 
português.\n\nPretende visualizar páginas em inglês, para melhor privacidade?
 torbutton.popup.no_newnym = O Torbutton não pode, em segurança, fornecer-lhe 
uma nova identidade. Não tem acesso à porta de controle Tor.\n\nEstá a usar 
o Tor Browser Bundle?
 torbutton.title.prompt_torbrowser = Informação Importante do Torbutton
-torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma 
diferente: já não o poderá desligar.\n\nEfetuámos alteração porque não 
é seguro usar o Torbutton num navegador também usado para navegação não 
Tor. Havia demasiados erros que não conseguiríamos corrigir de outra 
forma.\n\nSe pretende continuar a usar o Firefox, deve desinstalar o Torbutton 
e descarregar o Tor Browser Bundle para o seu computador. As políticas de 
privacidade do Navegador Tor também são superiores às normais no Firefox, 
mesmo quando este é usado com o Torbutton.\n\nPara remover o Torbutton, aceda 
a Ferramentas->Acessórios->Extensões e clique no botão Remover junto ao 
Torbutton.
+torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma 
diferente: já não pode desligá-lo.\n\nNós efetuámos esta alteração 
porque não é seguro utilizar o Torbutton num navegador que também é 
utilizado para a navegação sem o Tor. Existiam demasiados erros que nós não 
conseguiríamos corrigir de outra forma.\n\nSe pretender continuar a utilizar o 
Firefox normalmente, deverá desinstalar o Torbutton e transferir o Pacote do 
Tor Browser. As propriedades de privacidade do Tor Browser também são 
superiores àquelas do Firefox normal, mesmo quando este é utilizado com o 
Torbutton.\n\nPara remover o Torbutton, vá a Ferramentas->Add-ons->Extensões 
e depois clique no botão 'Remover' junto ao Torbutton.
 torbutton.popup.short_torbrowser = Informação importante do Torbutton!\nO 
Torbutton não está sempre activo.\nClique no Torbutton para mais informação.
 
 torbutton.popup.confirm_plugins = Os plugins tais como o Flash podem invadir a 
sua privacidade.\n\nTambém podem originar que o Tor revele a sua localização 
e o seu endereço IP.\n\nTem a certeza de que deseja ativar os plugins?\n\n

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


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2017-02-28 Thread translation
commit 6a618fa9d1e75bd879ec08f79ed852403cf51945
Author: Translation commit bot 
Date:   Tue Feb 28 16:16:26 2017 +

Update translations for tails-misc_completed
---
 pt.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt.po b/pt.po
index 6950f8e..685327d 100644
--- a/pt.po
+++ b/pt.po
@@ -24,7 +24,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-23 11:32+0100\n"
-"PO-Revision-Date: 2017-02-28 14:59+\n"
+"PO-Revision-Date: 2017-02-28 16:06+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -340,7 +340,7 @@ msgstr "I2P não conseguiu iniciar."
 msgid ""
 "Something went wrong when I2P was starting. Check the logs in /var/log/i2p "
 "for more information."
-msgstr "Algo correu mal quando o I2P estava a iniciar. Veja os diários em 
/var/log/i2p para mais informação,"
+msgstr "Ocorreu algo de mal quando o I2P estava a iniciar. Consulte os 
registos em /var/log/i2p para mais informação."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:52
 msgid "I2P's router console is ready"
@@ -359,7 +359,7 @@ msgid ""
 "Eepsite tunnel not built within six minutes. Check the router console in the"
 " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to "
 "the network to try again."
-msgstr "Túnel Eepsite não foi estabelecido em menos de seis minutos. 
Verifique a consola do router no Navegador I2P ou os registos em /var/log/i2p 
para mais informações.\nReconecte-se à rede para tentar novamente."
+msgstr "Túnel Eepsite não foi estabelecido dentro dos seis minutos. 
Verifique a consola do router no Navegador I2P ou os registos em /var/log/i2p 
para mais informação.\nReligue à rede para tentar novamente."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:71
 msgid "I2P is ready"

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


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

2017-02-28 Thread translation
commit 1f5da472fdce1a59c150c17fba95269358985085
Author: Translation commit bot 
Date:   Tue Feb 28 16:15:57 2017 +

Update translations for torbirdy_completed
---
 pt/torbirdy.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd
index e72fb0c..9d2a4e7 100644
--- a/pt/torbirdy.dtd
+++ b/pt/torbirdy.dtd
@@ -34,7 +34,7 @@
 
 
 
-
+
 
 
 
@@ -42,7 +42,7 @@
 
 
 
-
+
 
 
 

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


[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2017-02-28 Thread translation
commit d5acfabad115713b6ad0d8effba4ef1bbebd8cc0
Author: Translation commit bot 
Date:   Tue Feb 28 16:15:39 2017 +

Update translations for tails-persistence-setup
---
 pt/pt.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index c35212d..5098836 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -8,7 +8,7 @@
 # Lídia Martins , 2015
 # kagazz , 2014
 # Luís Alexandre Campos M Barroso , 2015
-# alfalb_mansil, 2014
+# Manuela Silva , 2014,2017
 # Manuela Silva , 2015
 # Nizia Dantas , 2014
 # Drew Melim , 2014
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2017-01-30 15:01+\n"
-"Last-Translator: Sérgio Marques \n"
+"PO-Revision-Date: 2017-02-28 15:55+\n"
+"Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -177,7 +177,7 @@ msgstr "Volume persistente não pode ser lido. Problema de 
permissão ou titular
 
 #: ../lib/Tails/Persistence/Setup.pm:400
 msgid "Persistence volume is not writable. Maybe it was mounted read-only?"
-msgstr "Volume persistente não pode ser modificado. Talvez seja montado em 
moda de leitura somente?"
+msgstr "O volume persistente não é gravável. Este pode ter sido montado 
como só de leitura?"
 
 #: ../lib/Tails/Persistence/Setup.pm:409
 #, perl-format

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


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

2017-02-28 Thread translation
commit e5e831870d7f49c7b34eb4bb1679df428f7f50ba
Author: Translation commit bot 
Date:   Tue Feb 28 16:15:52 2017 +

Update translations for torbirdy
---
 pt/torbirdy.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd
index e72fb0c..9d2a4e7 100644
--- a/pt/torbirdy.dtd
+++ b/pt/torbirdy.dtd
@@ -34,7 +34,7 @@
 
 
 
-
+
 
 
 
@@ -42,7 +42,7 @@
 
 
 
-
+
 
 
 

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


[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2017-02-28 Thread translation
commit dfde2a9447a93c2dcef6eab7691c0c6f99b02ce9
Author: Translation commit bot 
Date:   Tue Feb 28 16:15:43 2017 +

Update translations for tails-persistence-setup_completed
---
 pt/pt.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index c35212d..5098836 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -8,7 +8,7 @@
 # Lídia Martins , 2015
 # kagazz , 2014
 # Luís Alexandre Campos M Barroso , 2015
-# alfalb_mansil, 2014
+# Manuela Silva , 2014,2017
 # Manuela Silva , 2015
 # Nizia Dantas , 2014
 # Drew Melim , 2014
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2017-01-30 15:01+\n"
-"Last-Translator: Sérgio Marques \n"
+"PO-Revision-Date: 2017-02-28 15:55+\n"
+"Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -177,7 +177,7 @@ msgstr "Volume persistente não pode ser lido. Problema de 
permissão ou titular
 
 #: ../lib/Tails/Persistence/Setup.pm:400
 msgid "Persistence volume is not writable. Maybe it was mounted read-only?"
-msgstr "Volume persistente não pode ser modificado. Talvez seja montado em 
moda de leitura somente?"
+msgstr "O volume persistente não é gravável. Este pode ter sido montado 
como só de leitura?"
 
 #: ../lib/Tails/Persistence/Setup.pm:409
 #, perl-format

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


[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2017-02-28 Thread translation
commit f0e29e3e82a4d99acabb959670401e49c9593789
Author: Translation commit bot 
Date:   Tue Feb 28 16:15:35 2017 +

Update translations for liveusb-creator_completed
---
 pt/pt.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index 0387507..72c6107 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -21,7 +21,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2017-02-28 15:33+\n"
+"PO-Revision-Date: 2017-02-28 16:12+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -489,7 +489,7 @@ msgstr "Não é possível gravar no %(device)s, a ignorar."
 
 #: ../liveusb/creator.py:399
 msgid "Unknown ISO, skipping checksum verification"
-msgstr "ISO desconhecido, a ignorar a verificação da assinatura digital"
+msgstr "ISO desconhecido, a ignorar soma de verificação"
 
 #: ../liveusb/creator.py:810
 #, python-format
@@ -555,15 +555,15 @@ msgstr "Utilize o ISO do sistema Live existente"
 
 #: ../liveusb/creator.py:143
 msgid "Verifying ISO MD5 checksum"
-msgstr "A verificar a assinatura digital MD5 do ISO"
+msgstr "A verificar soma de verificação MD5 do ISO"
 
 #: ../liveusb/creator.py:373
 msgid "Verifying SHA1 checksum of LiveCD image..."
-msgstr "A verificar a assinatura digital SHA1 da imagem do LiveCD ..."
+msgstr "A verificar a soma de verificação SHA1 da imagem do CD Live..."
 
 #: ../liveusb/creator.py:377
 msgid "Verifying SHA256 checksum of LiveCD image..."
-msgstr "A verificar a assinatura digital SHA256 da imagem do LiveCD ..."
+msgstr "A verificar a soma de verificação SHA256 da imagem do CD Live..."
 
 #: ../liveusb/creator.py:961 ../liveusb/creator.py:1280
 msgid "Verifying filesystem..."
@@ -579,7 +579,7 @@ msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the \"Run this program as an administrator\" box."
-msgstr "Aviso: Esta ferramenta precisa de ser executada como um Administrador. 
Para o fazer, clique direito no rato sob o ícone e abra as Propriedades. No 
separador Compatibilidade, selecione \"Executar como um Administrador\"."
+msgstr "Aviso: esta ferramenta precisa de ser executada como um Administrador. 
Para o fazer, clique direito no ícone e abra as Propriedades. No separador 
'Compatibilidade', selecione \"Executar como Administrador\"."
 
 #: ../liveusb/creator.py:162
 #, python-format

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


[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2017-02-28 Thread translation
commit d483aadb021a1eb093337fa0288dad9e97dc6d9a
Author: Translation commit bot 
Date:   Tue Feb 28 16:15:31 2017 +

Update translations for liveusb-creator
---
 pt/pt.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index 0387507..72c6107 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -21,7 +21,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2017-02-28 15:33+\n"
+"PO-Revision-Date: 2017-02-28 16:12+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -489,7 +489,7 @@ msgstr "Não é possível gravar no %(device)s, a ignorar."
 
 #: ../liveusb/creator.py:399
 msgid "Unknown ISO, skipping checksum verification"
-msgstr "ISO desconhecido, a ignorar a verificação da assinatura digital"
+msgstr "ISO desconhecido, a ignorar soma de verificação"
 
 #: ../liveusb/creator.py:810
 #, python-format
@@ -555,15 +555,15 @@ msgstr "Utilize o ISO do sistema Live existente"
 
 #: ../liveusb/creator.py:143
 msgid "Verifying ISO MD5 checksum"
-msgstr "A verificar a assinatura digital MD5 do ISO"
+msgstr "A verificar soma de verificação MD5 do ISO"
 
 #: ../liveusb/creator.py:373
 msgid "Verifying SHA1 checksum of LiveCD image..."
-msgstr "A verificar a assinatura digital SHA1 da imagem do LiveCD ..."
+msgstr "A verificar a soma de verificação SHA1 da imagem do CD Live..."
 
 #: ../liveusb/creator.py:377
 msgid "Verifying SHA256 checksum of LiveCD image..."
-msgstr "A verificar a assinatura digital SHA256 da imagem do LiveCD ..."
+msgstr "A verificar a soma de verificação SHA256 da imagem do CD Live..."
 
 #: ../liveusb/creator.py:961 ../liveusb/creator.py:1280
 msgid "Verifying filesystem..."
@@ -579,7 +579,7 @@ msgid ""
 "Warning: This tool needs to be run as an Administrator. To do this, right "
 "click on the icon and open the Properties. Under the Compatibility tab, "
 "check the \"Run this program as an administrator\" box."
-msgstr "Aviso: Esta ferramenta precisa de ser executada como um Administrador. 
Para o fazer, clique direito no rato sob o ícone e abra as Propriedades. No 
separador Compatibilidade, selecione \"Executar como um Administrador\"."
+msgstr "Aviso: esta ferramenta precisa de ser executada como um Administrador. 
Para o fazer, clique direito no ícone e abra as Propriedades. No separador 
'Compatibilidade', selecione \"Executar como Administrador\"."
 
 #: ../liveusb/creator.py:162
 #, python-format

___
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

2017-02-28 Thread translation
commit e1b417d42d6ea4c16eed39e11e474ebcf73466b9
Author: Translation commit bot 
Date:   Tue Feb 28 16:15:22 2017 +

Update translations for https_everywhere
---
 pt/ssl-observatory.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt/ssl-observatory.dtd b/pt/ssl-observatory.dtd
index 35c095d..2a63531 100644
--- a/pt/ssl-observatory.dtd
+++ b/pt/ssl-observatory.dtd
@@ -88,13 +88,13 @@ Passe com o rato pelas opções para mais informações:">
 
 
 
-
+
 
 
 
 
 
 
+"Submeter e verificar os certificados assinados automaticamente">
 

___
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

2017-02-28 Thread translation
commit e0c1a3cb52adf447be11a4b56de7be1d403dff86
Author: Translation commit bot 
Date:   Tue Feb 28 16:15:27 2017 +

Update translations for https_everywhere_completed
---
 pt/ssl-observatory.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt/ssl-observatory.dtd b/pt/ssl-observatory.dtd
index 35c095d..2a63531 100644
--- a/pt/ssl-observatory.dtd
+++ b/pt/ssl-observatory.dtd
@@ -88,13 +88,13 @@ Passe com o rato pelas opções para mais informações:">
 
 
 
-
+
 
 
 
 
 
 
+"Submeter e verificar os certificados assinados automaticamente">
 

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


[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-02-28 Thread translation
commit 5860a59a9528b63d6d5731ba8aede3c9f2f00c12
Author: Translation commit bot 
Date:   Tue Feb 28 15:48:30 2017 +

Update translations for tor-browser-manual
---
 pt/pt.po | 26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index 33d2a7f..24a27e5 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -1277,19 +1277,23 @@ msgstr ""
 
 #: troubleshooting.page:21
 msgid "Quick fixes"
-msgstr ""
+msgstr "Correções rápidas"
 
 #: troubleshooting.page:22
 msgid ""
 "If Tor Browser doesn’t connect, there may be a simple solution. Try each of 
"
 "the following:"
 msgstr ""
+"Se o Navegador Tor não ligar, pode haver uma solução simples. Tente cada 
um "
+"dos seguintes:"
 
 #: troubleshooting.page:29
 msgid ""
 "Your computer’s system clock must be set correctly, or Tor will not be able 
"
 "to connect."
 msgstr ""
+"O relógio do sistema do seu computador deve estar configurado corretamente, "
+"ou o Tor poderá não conseguir ligar."
 
 #: troubleshooting.page:35
 msgid ""
@@ -1306,7 +1310,7 @@ msgstr ""
 
 #: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
-msgstr ""
+msgstr "Desative temporariamente a sua firewall."
 
 #: troubleshooting.page:54
 msgid ""
@@ -1316,7 +1320,7 @@ msgstr ""
 
 #: troubleshooting.page:64
 msgid "Is your connection censored?"
-msgstr ""
+msgstr "A sua ligação está censurada?"
 
 #: troubleshooting.page:65
 msgid ""
@@ -1327,7 +1331,7 @@ msgstr ""
 
 #: troubleshooting.page:74
 msgid "Known issues"
-msgstr ""
+msgstr "Problemas conhecidos"
 
 #: troubleshooting.page:75
 msgid ""
@@ -1343,7 +1347,7 @@ msgstr "Como remover o Navegador Tor do seu sistema"
 
 #: uninstalling.page:10
 msgid "Uninstalling"
-msgstr ""
+msgstr "Desinstalação"
 
 #: uninstalling.page:12
 msgid ""
@@ -1370,7 +1374,7 @@ msgstr "Eliminar a pasta do Navegador Tor."
 
 #: uninstalling.page:35
 msgid "Empty your Trash"
-msgstr ""
+msgstr "Limpe a sua reciclagem"
 
 #: uninstalling.page:39
 msgid ""
@@ -1383,7 +1387,7 @@ msgstr "Como atualizar o Navegador Tor"
 
 #: updating.page:10
 msgid "Updating"
-msgstr ""
+msgstr "Atualização"
 
 #: updating.page:12
 msgid ""
@@ -1431,6 +1435,8 @@ msgid ""
 "external ref='media/updating/update3.png' "
 "md5='4bd08622b0cacf20b13f75c432176ed3'"
 msgstr ""
+"ref. externa='media/updating/update3.png' "
+"md5='4bd08622b0cacf20b13f75c432176ed3'"
 
 #: updating.page:41
 msgid ""
@@ -1448,6 +1454,8 @@ msgid ""
 "external ref='media/updating/update4.png' "
 "md5='1d795e7b695738531db9d4b2b0fb5313'"
 msgstr ""
+"ref. externa='media/updating/update4.png' "
+"md5='1d795e7b695738531db9d4b2b0fb5313'"
 
 #: updating.page:50
 msgid ""
@@ -1481,5 +1489,5 @@ msgstr ""
 "Visite https://www.torproject.org/projects/torbrowser.html.en\;> "
 "https://www.torproject.org/projects/torbrowser.html.en e transfira "
-"uma cópia do lançamento mais recente do Navegador Tor, depois instale-o 
como"
-" antes."
+"uma cópia do lançamento mais recente do Tor Browser, depois instale-o "
+"normalmente."

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


[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.6

2017-02-28 Thread nickm
commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac
Merge: f7ed4a7 884b371
Author: Nick Mathewson 
Date:   Tue Feb 28 10:25:51 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

"ours" merge to avoid version bumps




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


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

2017-02-28 Thread translation
commit 52c22dadc167fd37ff404fd09caabe3a86442cfb
Author: Translation commit bot 
Date:   Tue Feb 28 15:47:04 2017 +

Update translations for tor_animation
---
 pt.srt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt.srt b/pt.srt
index 1878bf8..97bf641 100644
--- a/pt.srt
+++ b/pt.srt
@@ -148,7 +148,7 @@ a não ser que inicie a sessão e lhes diga.
 
 32
 00:01:54,200 --> 00:01:55,840
-Ao descarregar e utilizar o Tor,
+Ao transferir e utilizar o Tor,
 
 33
 00:01:56,200 --> 00:01:58,560
@@ -161,5 +161,5 @@ si aktivistët, gazetarët dhe blogerët.
 
 35
 00:02:02,000 --> 00:02:07,000
-Descarregue e utilize o Tor! Ou execute um retransmissor.
+Transfira e utilize o Tor! Ou execute um retransmissor.
 

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


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

2017-02-28 Thread translation
commit 946d7938343ae8c89554eb28f4af7282c9eeab93
Author: Translation commit bot 
Date:   Tue Feb 28 15:47:08 2017 +

Update translations for tor_animation_completed
---
 pt.srt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt.srt b/pt.srt
index 1878bf8..97bf641 100644
--- a/pt.srt
+++ b/pt.srt
@@ -148,7 +148,7 @@ a não ser que inicie a sessão e lhes diga.
 
 32
 00:01:54,200 --> 00:01:55,840
-Ao descarregar e utilizar o Tor,
+Ao transferir e utilizar o Tor,
 
 33
 00:01:56,200 --> 00:01:58,560
@@ -161,5 +161,5 @@ si aktivistët, gazetarët dhe blogerët.
 
 35
 00:02:02,000 --> 00:02:07,000
-Descarregue e utilize o Tor! Ou execute um retransmissor.
+Transfira e utilize o Tor! Ou execute um retransmissor.
 

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


[tor-commits] [translation/tails-iuk_completed] Update translations for tails-iuk_completed

2017-02-28 Thread translation
commit f1befd36c461cac72ecd2434270bc3d9b33e3a00
Author: Translation commit bot 
Date:   Tue Feb 28 15:46:50 2017 +

Update translations for tails-iuk_completed
---
 pt.po | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pt.po b/pt.po
index 1607cca..c0f6c17 100644
--- a/pt.po
+++ b/pt.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 16:55+0200\n"
-"PO-Revision-Date: 2017-01-30 16:44+\n"
+"PO-Revision-Date: 2017-02-28 15:26+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -116,7 +116,7 @@ msgid ""
 "Download size: %{size}s\n"
 "\n"
 "Do you want to upgrade now?"
-msgstr "Deve atualizar para o %{name}s %{version}s.\n\nPara mais 
informação acerca desta nova versão, aceda a %{details_url}s\n\nrecomenda-se 
que feche todas as aplicações abertas durante a atualização.\nA descarga da 
atualização pode demorar algum tempo, desde alguns minutos até algumas 
horas.\nA rede será desativada após terminar de descarregar a 
atualização.\n\nTamanho do ficheiro: %{size}s\n\nDeseja atualizar agora?"
+msgstr "Deveria atualizar para %{name}s %{version}s.\n\nPara mais 
informação sobre esta nova versão, vá para %{details_url}s\n\nRecomenda-se 
que feche todas as aplicações abertas durante a atualização.\nA 
transferência da atualização pode demorar algum tempo, desde alguns minutos 
até algumas horas.\nA rede será desativada depois transferir a 
atualização.\n\nTamanho do ficheiro: %{size}s\n\nDeseja atualizar agora?"
 
 #: ../lib/Tails/IUK/Frontend.pm:386
 msgid "Upgrade available"
@@ -148,12 +148,12 @@ msgstr "Disponível nova versão"
 
 #: ../lib/Tails/IUK/Frontend.pm:469
 msgid "Downloading upgrade"
-msgstr "A descarregar atualização"
+msgstr "A transferir a atualização"
 
 #: ../lib/Tails/IUK/Frontend.pm:472
 #, perl-brace-format
 msgid "Downloading the upgrade to %{name}s %{version}s..."
-msgstr "A descarregar a atualização para %{name}s %{version}s ..."
+msgstr "A transferir a atualização para %{name}s %{version}s..."
 
 #: ../lib/Tails/IUK/Frontend.pm:513
 msgid ""
@@ -165,7 +165,7 @@ msgstr "Não foi possível transferir a 
atualização.\\n\\nVerifique a s
 
 #: ../lib/Tails/IUK/Frontend.pm:529 ../lib/Tails/IUK/Frontend.pm:548
 msgid "Error while downloading the upgrade"
-msgstr "Ocorreu um erro ao descarregar a atualização"
+msgstr "Erro durante a transferência da atualização"
 
 #: ../lib/Tails/IUK/Frontend.pm:541
 #, perl-brace-format
@@ -176,22 +176,22 @@ msgstr "O ficheiro de saída file '%{output_file}s' não 
existe, mas o tails-iuk
 
 #: ../lib/Tails/IUK/Frontend.pm:560
 msgid "Error while creating temporary downloading directory"
-msgstr "Erro ao criar a pasta temporária da descarga"
+msgstr "Erro ao criar a pasta temporária da transferência"
 
 #: ../lib/Tails/IUK/Frontend.pm:563
 msgid "Failed to create temporary download directory"
-msgstr "Falha ao criar a pasta temporária da descarga"
+msgstr "Falha ao criar a pasta temporária da transferência"
 
 #: ../lib/Tails/IUK/Frontend.pm:587
 msgid ""
 "Could not choose a download server.\n"
 "\n"
 "This should not happen. Please report a bug."
-msgstr "Não foi possível escolher o servidor de 
transferência.\n\nEste não deveria acontecer. Por favor, comunique um 
erro."
+msgstr "Não foi possível escolher o servidor de 
transferência.\n\nIsto não deveria acontecer. Por favor, comunique um 
erro."
 
 #: ../lib/Tails/IUK/Frontend.pm:591
 msgid "Error while choosing a download server"
-msgstr "Erro ao escolher o servidor de descarga"
+msgstr "Erro ao escolher o servidor de transferência"
 
 #: ../lib/Tails/IUK/Frontend.pm:608
 msgid ""

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


[tor-commits] [translation/tails-iuk] Update translations for tails-iuk

2017-02-28 Thread translation
commit 904e54cb2207dda9c1b5fe23df4246b64463da5b
Author: Translation commit bot 
Date:   Tue Feb 28 15:46:46 2017 +

Update translations for tails-iuk
---
 pt.po | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pt.po b/pt.po
index 1607cca..c0f6c17 100644
--- a/pt.po
+++ b/pt.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 16:55+0200\n"
-"PO-Revision-Date: 2017-01-30 16:44+\n"
+"PO-Revision-Date: 2017-02-28 15:26+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -116,7 +116,7 @@ msgid ""
 "Download size: %{size}s\n"
 "\n"
 "Do you want to upgrade now?"
-msgstr "Deve atualizar para o %{name}s %{version}s.\n\nPara mais 
informação acerca desta nova versão, aceda a %{details_url}s\n\nrecomenda-se 
que feche todas as aplicações abertas durante a atualização.\nA descarga da 
atualização pode demorar algum tempo, desde alguns minutos até algumas 
horas.\nA rede será desativada após terminar de descarregar a 
atualização.\n\nTamanho do ficheiro: %{size}s\n\nDeseja atualizar agora?"
+msgstr "Deveria atualizar para %{name}s %{version}s.\n\nPara mais 
informação sobre esta nova versão, vá para %{details_url}s\n\nRecomenda-se 
que feche todas as aplicações abertas durante a atualização.\nA 
transferência da atualização pode demorar algum tempo, desde alguns minutos 
até algumas horas.\nA rede será desativada depois transferir a 
atualização.\n\nTamanho do ficheiro: %{size}s\n\nDeseja atualizar agora?"
 
 #: ../lib/Tails/IUK/Frontend.pm:386
 msgid "Upgrade available"
@@ -148,12 +148,12 @@ msgstr "Disponível nova versão"
 
 #: ../lib/Tails/IUK/Frontend.pm:469
 msgid "Downloading upgrade"
-msgstr "A descarregar atualização"
+msgstr "A transferir a atualização"
 
 #: ../lib/Tails/IUK/Frontend.pm:472
 #, perl-brace-format
 msgid "Downloading the upgrade to %{name}s %{version}s..."
-msgstr "A descarregar a atualização para %{name}s %{version}s ..."
+msgstr "A transferir a atualização para %{name}s %{version}s..."
 
 #: ../lib/Tails/IUK/Frontend.pm:513
 msgid ""
@@ -165,7 +165,7 @@ msgstr "Não foi possível transferir a 
atualização.\\n\\nVerifique a s
 
 #: ../lib/Tails/IUK/Frontend.pm:529 ../lib/Tails/IUK/Frontend.pm:548
 msgid "Error while downloading the upgrade"
-msgstr "Ocorreu um erro ao descarregar a atualização"
+msgstr "Erro durante a transferência da atualização"
 
 #: ../lib/Tails/IUK/Frontend.pm:541
 #, perl-brace-format
@@ -176,22 +176,22 @@ msgstr "O ficheiro de saída file '%{output_file}s' não 
existe, mas o tails-iuk
 
 #: ../lib/Tails/IUK/Frontend.pm:560
 msgid "Error while creating temporary downloading directory"
-msgstr "Erro ao criar a pasta temporária da descarga"
+msgstr "Erro ao criar a pasta temporária da transferência"
 
 #: ../lib/Tails/IUK/Frontend.pm:563
 msgid "Failed to create temporary download directory"
-msgstr "Falha ao criar a pasta temporária da descarga"
+msgstr "Falha ao criar a pasta temporária da transferência"
 
 #: ../lib/Tails/IUK/Frontend.pm:587
 msgid ""
 "Could not choose a download server.\n"
 "\n"
 "This should not happen. Please report a bug."
-msgstr "Não foi possível escolher o servidor de 
transferência.\n\nEste não deveria acontecer. Por favor, comunique um 
erro."
+msgstr "Não foi possível escolher o servidor de 
transferência.\n\nIsto não deveria acontecer. Por favor, comunique um 
erro."
 
 #: ../lib/Tails/IUK/Frontend.pm:591
 msgid "Error while choosing a download server"
-msgstr "Erro ao escolher o servidor de descarga"
+msgstr "Erro ao escolher o servidor de transferência"
 
 #: ../lib/Tails/IUK/Frontend.pm:608
 msgid ""

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


[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-02-28 Thread nickm
commit f93bcab60e09618bf5b9ec55c6f4f338f2a7cd06
Merge: f2a657c b5526be
Author: Nick Mathewson 
Date:   Tue Feb 28 10:37:25 2017 -0500

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

This is an "ours" merge to avoid taking a version bump, and to
avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto 
maint-0.2.8, which already included the relevant changes.




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


[tor-commits] [tor/release-0.2.9] Edit some changelog text

2017-02-28 Thread nickm
commit 1512e7e5398701aa3a33acbf7b884e5d1409608b
Author: Nick Mathewson 
Date:   Wed Oct 21 14:34:48 2015 -0400

Edit some changelog text
---
 ChangeLog | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 077e8a4..6d40010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,16 @@
 Changes in version 0.2.7.4-rc - 2015-10-21
-  Tor 0.2.7.4-rc is the second release candidate in the 0.2.7 servies.
-  It a few small bugfixes, notably fixes for compilation and portability
-  on different platforms. If no further significant bounds are found,
-  the next release will the the official stable release.
+  Tor 0.2.7.4-rc is the second release candidate in the 0.2.7 series.
+  It fixes some important memory leaks, and a scary-looking (but mostly
+  harmless in practice) invalid-read bug.  It also has a few small
+  bugfixes, notably fixes for compilation and portability on different
+  platforms. If no further significant bounds are found, the next
+  release will the the official stable release.
 
   o Major bugfixes (security, correctness):
-- Fix a programming error that could cause us to read 4 bytes before
-  the beginning of an openssl string. This could be used to provoke
-  a crash on systems with an unusual malloc implementation, or
-  systems with unsual hardening installed. Fixes bug 17404; bugfix
+- Fix an error that could cause us to read 4 bytes before
+  the beginning of an openssl string. This bug could be used to
+  cause Tor to crash on systems with unusual malloc implementations, or
+  systems with unusual hardening installed. Fixes bug 17404; bugfix
   on 0.2.3.6-alpha.
 
   o Major bugfixes (correctness):



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


[tor-commits] [tor/release-0.2.9] Re-order and condense some ReleaseNotes items

2017-02-28 Thread nickm
commit 99d39e937e43ddc79c0a089de2c3e436e055461b
Author: Nick Mathewson 
Date:   Thu Nov 5 09:39:44 2015 -0500

Re-order and condense some ReleaseNotes items
---
 ReleaseNotes | 243 ---
 1 file changed, 100 insertions(+), 143 deletions(-)

diff --git a/ReleaseNotes b/ReleaseNotes
index 131d015..029dd61 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -6,6 +6,24 @@ each development snapshot, see the ChangeLog file.
 Changes in version 0.2.7.5- 2015-11-??
    WRITE A BLURB 
 
+  o New system requirements:
+- Tor no longer includes workarounds to support Libevent versions
+  before 1.3e. Libevent 2.0 or later is recommended. Closes
+  ticket 15248.
+- Tor no longer supports copies of OpenSSL that are missing support
+  for Elliptic Curve Cryptography. (We began using ECC when
+  available in 0.2.4.8-alpha, for more safe and efficient key
+  negotiation.) In particular, support for at least one of P256 or
+  P224 is now required, with manual configuration needed if only
+  P224 is available. Resolves ticket 16140.
+- Tor no longer supports versions of OpenSSL before 1.0. (If you are
+  on an operating system that has not upgraded to OpenSSL 1.0 or
+  later, and you compile Tor from source, you will need to install a
+  more recent OpenSSL to link Tor against.) These versions of
+  OpenSSL are still supported by the OpenSSL, but the numerous
+  cryptographic improvements in later OpenSSL releases makes them a
+  clear choice. Resolves ticket 16034.
+
   o Major features (controller):
 - Add the ADD_ONION and DEL_ONION commands that allow the creation
   and management of hidden services via the controller. Closes
@@ -36,24 +54,43 @@ Changes in version 0.2.7.5- 2015-11-??
   vary freely. Implements part of ticket 12498.
 - Microdescriptors now include Ed25519 identity keys. Implements
   part of ticket 12498.
+- Add a --newpass option to allow changing or removing the
+  passphrase of an encrypted key with tor --keygen. Implements part
+  of ticket 16769.
+- Add a new OfflineMasterKey option to tell Tor never to try loading
+  or generating a secret Ed25519 identity key. You can use this in
+  combination with tor --keygen to manage offline and/or encrypted
+  Ed25519 keys. Implements ticket 16944.
+- On receiving a HUP signal, check to see whether the Ed25519
+  signing key has changed, and reload it if so. Closes ticket 16790.
+- Significant usability improvements for Ed25519 key management. Log
+  messages are better, and the code can recover from far more
+  failure conditions. Thanks to "s7r" for reporting and diagnosing
+  so many of these!
 
-  o Major features (Ed25519 keys, keypinning):
-- The key-pinning option on directory authorities is now advisory-
-  only by default. In a future version, or when the AuthDirPinKeys
-  option is set, pins are enforced again. Disabling key-pinning
-  seemed like a good idea so that we can survive the fallout of any
-  usability problems associated with Ed25519 keys. Closes
-  ticket 17135.
-
-  o Major features (Ed25519 performance):
+  o Major features (ECC performance):
 - Improve the runtime speed of Ed25519 signature verification by
   using Ed25519-donna's batch verification support. Implements
   ticket 16533.
 - Improve the speed of Ed25519 operations and Curve25519 keypair
   generation when built targeting 32 bit x86 platforms with SSE2
   available. Implements ticket 16535.
+- Improve the runtime speed of Ed25519 operations by using the
+  public-domain Ed25519-donna by Andrew M. ("floodyberry").
+  Implements ticket 16467.
+- Improve the runtime speed of the ntor handshake by using an
+  optimized curve25519 basepoint scalarmult implementation from the
+  public-domain Ed25519-donna by Andrew M. ("floodyberry"), based on
+  ideas by Adam Langley. Implements ticket 9663.
 
   o Major features (Hidden services):
+- Hidden services, if using the EntryNodes option, are required to
+  use more than one EntryNode, in order to avoid a guard discovery
+  attack. (This would only affect people who had configured hidden
+  services and manually specified the EntryNodes option with a
+  single entry-node. The impact was that it would be easy to
+  remotely identify the guard node used by such a hidden service.
+  See ticket for more information.) Fixes ticket 14917.
 - Add the torrc option HiddenServiceNumIntroductionPoints, to
   specify a fixed number of introduction points. Its maximum value
   is 10 and default is 3. Using this option can increase a hidden
@@ -72,44 +109,6 @@ Changes in version 0.2.7.5- 2015-11-??
   of this change, microdescriptors will no longer need to include
   RSA identity keys. Implements proposal 

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm
commit cd8a62a60cbafb61bed8b64e988dacf2b1444668
Merge: 3f3a753 7b859fd
Author: Nick Mathewson 
Date:   Wed Oct 21 13:35:04 2015 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug17364| 3 +++
 changes/bug17403| 3 +++
 changes/bug17404| 6 ++
 doc/tor.1.txt   | 4 ++--
 src/common/tortls.c | 4 
 src/or/routerkeys.c | 2 ++
 6 files changed, 20 insertions(+), 2 deletions(-)



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


[tor-commits] [tor/release-0.2.8] Bump version to 0.2.7.7

2017-02-28 Thread nickm
commit b5526bef384524badbd1411ad9570e6373438b06
Author: Nick Mathewson 
Date:   Tue Feb 28 10:27:20 2017 -0500

Bump version to 0.2.7.7
---
 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 d37c34d..80c4d3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.7.6-dev])
+AC_INIT([tor],[0.2.7.7])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 08cef8d..f20c1a6 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.7.6-dev"
+!define VERSION "0.2.7.7"
 !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 8b687c8..57385c9 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -232,7 +232,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.7.6-dev"
+#define VERSION "0.2.7.7"
 
 
 



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


[tor-commits] [tor/release-0.2.9] Reflow changelog

2017-02-28 Thread nickm
commit 3f3a753e36a3d6114fcaa7059a534317f5a59fc0
Author: Nick Mathewson 
Date:   Wed Oct 21 11:09:41 2015 -0400

Reflow changelog
---
 ChangeLog | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5041e76..259e4e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,15 +4,15 @@ Changes in version 0.2.7.4-rc - 2015-10-21
   on different platforms. If no further significant bounds are found,
   the next release will the the official stable release.
 
-  o Major bugfixes (memory leaks):
-- Fix a memory leak in ed25519 batch signature checking.
-  Fixes bug 17398; bugfix on 0.2.6.1-alpha.
-- Fix a memory leak in rend_cache_failure_entry_free().
-  Fixes bug 17402; bugfix on 0.2.7.3-rc.
-
   o Major bugfixes (correctness):
-- Fix a use-after-free bug in validate_intro_point_failure().
-  Fixes bug 17401; bugfix on 0.2.7.3-rc.
+- Fix a use-after-free bug in validate_intro_point_failure(). Fixes
+  bug 17401; bugfix on 0.2.7.3-rc.
+
+  o Major bugfixes (memory leaks):
+- Fix a memory leak in ed25519 batch signature checking. Fixes bug
+  17398; bugfix on 0.2.6.1-alpha.
+- Fix a memory leak in rend_cache_failure_entry_free(). Fixes bug
+  17402; bugfix on 0.2.7.3-rc.
 
   o Minor features (geoIP):
 - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2



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


[tor-commits] [tor/release-0.2.9] More 0274-rc changelog updating

2017-02-28 Thread nickm
commit 89a9d8c8d75dac081dd304442182e29186888c39
Author: Nick Mathewson 
Date:   Wed Oct 21 13:37:06 2015 -0400

More 0274-rc changelog updating
---
 ChangeLog| 11 +++
 changes/bug17364 |  3 ---
 changes/bug17403 |  3 ---
 changes/bug17404 |  6 --
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 259e4e5..077e8a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@ Changes in version 0.2.7.4-rc - 2015-10-21
   on different platforms. If no further significant bounds are found,
   the next release will the the official stable release.
 
+  o Major bugfixes (security, correctness):
+- Fix a programming error that could cause us to read 4 bytes before
+  the beginning of an openssl string. This could be used to provoke
+  a crash on systems with an unusual malloc implementation, or
+  systems with unsual hardening installed. Fixes bug 17404; bugfix
+  on 0.2.3.6-alpha.
+
   o Major bugfixes (correctness):
 - Fix a use-after-free bug in validate_intro_point_failure(). Fixes
   bug 17401; bugfix on 0.2.7.3-rc.
@@ -13,6 +20,8 @@ Changes in version 0.2.7.4-rc - 2015-10-21
   17398; bugfix on 0.2.6.1-alpha.
 - Fix a memory leak in rend_cache_failure_entry_free(). Fixes bug
   17402; bugfix on 0.2.7.3-rc.
+- Fix a memory leak when reading an expired signing key from disk.
+  Fixes bug 17403; bugfix on 0.2.7.2-rc.
 
   o Minor features (geoIP):
 - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2
@@ -51,6 +60,8 @@ Changes in version 0.2.7.4-rc - 2015-10-21
 
   o Documentation:
 - Fix capitalization of SOCKS in sample torrc. Closes ticket 15609.
+- Note that HiddenServicePorts can take a unix domain socket. Closes
+  ticket 17364.
 
 
 Changes in version 0.2.7.3-rc - 2015-09-25
diff --git a/changes/bug17364 b/changes/bug17364
deleted file mode 100644
index dd9ff12..000
--- a/changes/bug17364
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation:
-- Note that HiddenServicePorts can take a unix domain socket.
-  Closes ticket 17364.
diff --git a/changes/bug17403 b/changes/bug17403
deleted file mode 100644
index e83a4a2..000
--- a/changes/bug17403
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (memory leaks):
-- Fix a memory leak when reading an expired signing key from disk.
-  Fixes bug 17403; bugfix on 0.2.7.2-rc.
diff --git a/changes/bug17404 b/changes/bug17404
deleted file mode 100644
index d524f66..000
--- a/changes/bug17404
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (security, correctness):
-- Fix a programming error that could cause us to read 4 bytes before
-  the beginning of an openssl string. This could be used to provoke
-  a crash on systems with an unusual malloc implementation, or
-  systems with unsual hardening installed. Fixes bug 17404; bugfix
-  on 0.2.3.6-alpha.



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


[tor-commits] [tor/release-0.2.8] Bump version to 0.2.5.13

2017-02-28 Thread nickm
commit 884b3717a92465a3d6ab31d819e4011d3d929b3c
Author: Nick Mathewson 
Date:   Tue Feb 28 10:23:20 2017 -0500

Bump version to 0.2.5.13
---
 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 29ba2fd..8f85dae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2013, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.5.12])
+AC_INIT([tor],[0.2.5.13])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 2fb15b8..9661e10 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.5.12"
+!define VERSION "0.2.5.13"
 !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 6d6cde4..aa04092 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.5.12"
+#define VERSION "0.2.5.13"
 
 
 



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


[tor-commits] [tor/maint-0.3.0] Fold new entries into ChangeLog for 0.2.7.4-rc

2017-02-28 Thread nickm
commit cc3ce6854872fb9b06fbb5bb188c1c58585af282
Author: Nick Mathewson 
Date:   Wed Oct 21 11:09:16 2015 -0400

Fold new entries into ChangeLog for 0.2.7.4-rc
---
 ChangeLog | 10 ++
 changes/bug15609  |  2 --
 changes/bug17151  |  7 ---
 changes/bug17154  |  3 ---
 changes/bug17173-socket-hack-rv   |  3 ---
 changes/bug17237_027  |  3 ---
 changes/bug17251  |  3 ---
 changes/bug17347  |  4 
 changes/bug17354  |  4 
 changes/bug17398  |  3 ---
 changes/bug17401  |  3 ---
 changes/bug17402  |  3 ---
 changes/geoip-october2015 |  3 ---
 changes/ifaddrs-tests-network-configs |  5 -
 14 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f6c2d4..5041e76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,16 @@ Changes in version 0.2.7.4-rc - 2015-10-21
   on different platforms. If no further significant bounds are found,
   the next release will the the official stable release.
 
+  o Major bugfixes (memory leaks):
+- Fix a memory leak in ed25519 batch signature checking.
+  Fixes bug 17398; bugfix on 0.2.6.1-alpha.
+- Fix a memory leak in rend_cache_failure_entry_free().
+  Fixes bug 17402; bugfix on 0.2.7.3-rc.
+
+  o Major bugfixes (correctness):
+- Fix a use-after-free bug in validate_intro_point_failure().
+  Fixes bug 17401; bugfix on 0.2.7.3-rc.
+
   o Minor features (geoIP):
 - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2
   Country database.
diff --git a/changes/bug15609 b/changes/bug15609
deleted file mode 100644
index efaccde..000
--- a/changes/bug15609
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Documentation:
-- Fix capitalization of SOCKS in sample torrc. Closes ticket 15609.
diff --git a/changes/bug17151 b/changes/bug17151
deleted file mode 100644
index 0993b90..000
--- a/changes/bug17151
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (portability):
-- Use libexecinfo on FreeBSD, to enable backtrace support. Fixes part of
-  bug 17151; bugfix on 0.2.5.2-alpha. Patch from Marcin Cieślak.
-
-  o Minor bugfixes (testing):
-- Skip backtrace tests when backtrace support is not compiled in. Fixes
-  part of bug 17151; bugfix on 0.2.7.1-alpha. Patch from Marcin Cieślak.
diff --git a/changes/bug17154 b/changes/bug17154
deleted file mode 100644
index 6ad7b74..000
--- a/changes/bug17154
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (testing):
-- Fix breakage when running 'make check' with BSD make. Fixes bug
-  17154; bugfix on 0.2.7.3-rc. Patch by Marcin Cieślak.
diff --git a/changes/bug17173-socket-hack-rv b/changes/bug17173-socket-hack-rv
deleted file mode 100644
index d513211..000
--- a/changes/bug17173-socket-hack-rv
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bug fixes (addresses, testing):
-- Add unit tests for get_interface_address* failure cases.
-  Fixes bug 17173; bugfix on 0.2.7.3-rc.  Patch by fk/teor.
diff --git a/changes/bug17237_027 b/changes/bug17237_027
deleted file mode 100644
index e5978d0..000
--- a/changes/bug17237_027
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (compilation):
-- Repair compilation with the most recent (unreleased, alpha)
-  vesions of OpenSSL 1.1. Fixes part of ticket 17237.
diff --git a/changes/bug17251 b/changes/bug17251
deleted file mode 100644
index edd7739..000
--- a/changes/bug17251
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (compilation):
-- Fix an integer overflow warning in test_crypto_slow.c.
-  Fixes bug 17251; bugfix on 0.2.7.2-alpha.
diff --git a/changes/bug17347 b/changes/bug17347
deleted file mode 100644
index 487b132..000
--- a/changes/bug17347
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-- Fix compilation of sandbox.c with musl-libc.
-  Fixes bug 17347; bugfix on 0.2.5.1-alpha.
-  Patch from 'jamestk'.
diff --git a/changes/bug17354 b/changes/bug17354
deleted file mode 100644
index 53da007..000
--- a/changes/bug17354
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (sandbox):
-- Add the "hidserv-stats" filename to our sandbox filter for the
-  HiddenServiceStatistics option to work properly. Fixes bug 17354;
-  bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet.
diff --git a/changes/bug17398 b/changes/bug17398
deleted file mode 100644
index 66e27a6..000
--- a/changes/bug17398
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (memory leaks):
-- Fix a memory leak in ed25519 batch signature checking.
-  Fixes bug 17398; bugfix on 0.2.6.1-alpha.
diff --git a/changes/bug17401 b/changes/bug17401
deleted file mode 100644
index a22f79c..000
--- a/changes/bug17401
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major bugfixes 

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm
commit 67f0b51c9239dd1d2318007e3f503d4e09c3097b
Merge: 976f392 8378a33
Author: Nick Mathewson 
Date:   Mon Oct 19 11:20:03 2015 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



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


[tor-commits] [tor/maint-0.3.0] Reflow changelog

2017-02-28 Thread nickm
commit 5f60216b3b7bbe335f6e0f07452b46c38bb97d0c
Author: Nick Mathewson 
Date:   Wed Oct 21 15:10:21 2015 -0400

Reflow changelog
---
 ChangeLog | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afddbba..5226fef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,15 @@
 Changes in version 0.2.7.4-rc - 2015-10-21
-  Tor 0.2.7.4-rc is the second release candidate in the 0.2.7 series.
-  It fixes some important memory leaks, and a scary-looking (but mostly
-  harmless in practice) invalid-read bug.  It also has a few small
+  Tor 0.2.7.4-rc is the second release candidate in the 0.2.7 series. It
+  fixes some important memory leaks, and a scary-looking (but mostly
+  harmless in practice) invalid-read bug. It also has a few small
   bugfixes, notably fixes for compilation and portability on different
   platforms. If no further significant bounds are found, the next
   release will the the official stable release.
 
   o Major bugfixes (security, correctness):
-- Fix an error that could cause us to read 4 bytes before
-  the beginning of an openssl string. This bug could be used to
-  cause Tor to crash on systems with unusual malloc implementations, or
+- Fix an error that could cause us to read 4 bytes before the
+  beginning of an openssl string. This bug could be used to cause
+  Tor to crash on systems with unusual malloc implementations, or
   systems with unusual hardening installed. Fixes bug 17404; bugfix
   on 0.2.3.6-alpha.
 



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


[tor-commits] [tor/release-0.2.9] start trying to write a blurb

2017-02-28 Thread nickm
commit 4dd7a55cf22caa56ef53609e2545002733803a56
Author: Nick Mathewson 
Date:   Tue Nov 10 09:13:58 2015 -0500

start trying to write a blurb
---
 ReleaseNotes | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ReleaseNotes b/ReleaseNotes
index 029dd61..ef173af 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -3,8 +3,17 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
-Changes in version 0.2.7.5- 2015-11-??
-   WRITE A BLURB 
+Changes in version 0.2.7.5 - 2015-11-1?
+  Tor 0.2.7.5 is the first stable release in the Tor 0.2.7 series.
+
+  The 0.2.7 series adds a more secure identity key type for relays,
+  improves cryptography performance, resolves several longstanding
+  hidden-service performance issues, improves controller support for
+  hidden services, and includes small bugfixes and performance
+  improvements throughout the program.  This release series also
+  includes more tests than before, and significant simplifications
+  to which parts of Tor invoke which others.  For a full list of
+  changes, see below.
 
   o New system requirements:
 - Tor no longer includes workarounds to support Libevent versions



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


[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-02-28 Thread nickm
commit f93bcab60e09618bf5b9ec55c6f4f338f2a7cd06
Merge: f2a657c b5526be
Author: Nick Mathewson 
Date:   Tue Feb 28 10:37:25 2017 -0500

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

This is an "ours" merge to avoid taking a version bump, and to
avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto 
maint-0.2.8, which already included the relevant changes.




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


[tor-commits] [tor/maint-0.3.0] Edit some changelog text

2017-02-28 Thread nickm
commit 1512e7e5398701aa3a33acbf7b884e5d1409608b
Author: Nick Mathewson 
Date:   Wed Oct 21 14:34:48 2015 -0400

Edit some changelog text
---
 ChangeLog | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 077e8a4..6d40010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,16 @@
 Changes in version 0.2.7.4-rc - 2015-10-21
-  Tor 0.2.7.4-rc is the second release candidate in the 0.2.7 servies.
-  It a few small bugfixes, notably fixes for compilation and portability
-  on different platforms. If no further significant bounds are found,
-  the next release will the the official stable release.
+  Tor 0.2.7.4-rc is the second release candidate in the 0.2.7 series.
+  It fixes some important memory leaks, and a scary-looking (but mostly
+  harmless in practice) invalid-read bug.  It also has a few small
+  bugfixes, notably fixes for compilation and portability on different
+  platforms. If no further significant bounds are found, the next
+  release will the the official stable release.
 
   o Major bugfixes (security, correctness):
-- Fix a programming error that could cause us to read 4 bytes before
-  the beginning of an openssl string. This could be used to provoke
-  a crash on systems with an unusual malloc implementation, or
-  systems with unsual hardening installed. Fixes bug 17404; bugfix
+- Fix an error that could cause us to read 4 bytes before
+  the beginning of an openssl string. This bug could be used to
+  cause Tor to crash on systems with unusual malloc implementations, or
+  systems with unusual hardening installed. Fixes bug 17404; bugfix
   on 0.2.3.6-alpha.
 
   o Major bugfixes (correctness):



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


[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm
commit b2a53e8ca910391a10451860a1aaf66b3c207f50
Merge: e0fa07c c6a3375
Author: Roger Dingledine 
Date:   Thu Dec 10 04:12:10 2015 -0500

Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug16056   |4 +
 changes/bug16702   |4 +
 changes/bug17551   |4 +
 changes/bug17722   |3 +
 changes/bug17772   |7 +
 changes/bug17781   |3 +
 changes/geoip-december2015 |4 +
 configure.ac   |3 +
 src/config/geoip   | 4547 
 src/config/geoip6  | 2580 +
 src/or/policies.c  |6 +-
 src/or/rendservice.c   |3 +-
 src/or/routerlist.c|   10 +-
 src/or/torcert.c   |6 +-
 14 files changed, 5558 insertions(+), 1626 deletions(-)



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


[tor-commits] [tor/release-0.2.9] missing parenthesis

2017-02-28 Thread nickm
commit 47649a558de24961c6784f54dcde84debf8c5851
Author: Nick Mathewson 
Date:   Tue Oct 20 16:41:28 2015 -0400

missing parenthesis
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0a57f7d..ee3bd69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,7 +34,7 @@ Changes in version 0.2.7.4-rc - 2015-10-20
 - Make the get_ifaddrs_* unit tests more tolerant of different
   network configurations. (Don't assume every test box has an IPv4
   address, and Don't assume every test box has a non-localhost
-  address. Fixes bug 17255; bugfix on 0.2.7.3-rc. Patch by "teor".
+  address.) Fixes bug 17255; bugfix on 0.2.7.3-rc. Patch by "teor".
 - Skip backtrace tests when backtrace support is not compiled in.
   Fixes part of bug 17151; bugfix on 0.2.7.1-alpha. Patch from
   Marcin Cieślak.



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


[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2017-02-28 Thread translation
commit 89b60fcd42a720d15bc90bca875c2b678b41741b
Author: Translation commit bot 
Date:   Tue Feb 28 15:45:37 2017 +

Update translations for liveusb-creator_completed
---
 pt/pt.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index e3c494a..0387507 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -21,7 +21,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2017-02-28 14:05+\n"
+"PO-Revision-Date: 2017-02-28 15:33+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -165,7 +165,7 @@ msgstr "A transferência falhou:"
 #: ../liveusb/gui.py:89
 #, python-format
 msgid "Downloading %s..."
-msgstr "A descarregar %s..."
+msgstr "A transferir %s..."
 
 #: ../liveusb/creator.py:1192
 msgid "Drive is a loopback, skipping MBR reset"
@@ -213,7 +213,7 @@ msgstr "Não foi possível verificar a assinatura digital 
MD5 do ISO"
 msgid ""
 "If you do not select an existing Live ISO, the selected release will be "
 "downloaded for you."
-msgstr "Se não selecionar um Live ISO existente, a versão selecionada será 
descarregada."
+msgstr "Se não selecionar um ISO Live existente, a versão selecionada será 
transferida."
 
 #: ../liveusb/launcher_ui.py:154
 msgid ""
@@ -386,7 +386,7 @@ msgid ""
 "This button allows you to browse for an existing Live system ISO that you "
 "have previously downloaded.  If you do not select one, a release will be "
 "downloaded for you automatically."
-msgstr "Este botão permite-lhe procurar uma versão da ISO do sistema Live, 
previamente descarregada. Se não selecionar uma versão, a versão selecionada 
será descarregada."
+msgstr "Este botão permite-lhe procurar por um ISO do sistema Live que já 
transferiu. Se não selecionar um, a versão selecionada será transferida."
 
 #: ../liveusb/dialog.py:171
 msgid ""
@@ -394,7 +394,7 @@ msgid ""
 "optionally downloading a release (if an existing one wasn't selected),  "
 "extracting the ISO to the USB device, creating the persistent overlay, and "
 "installing the bootloader."
-msgstr "Este botão irá iniciar o processo de criação da LiveUSB. O 
processo envolve a descarga, opcional, de uma versão (se não selecionar uma 
do seu computador), seguido da extração da ISO para o dispositivo USB, criar 
o armazenamento permanente e instalar o bootloader."
+msgstr "Este botão irá iniciar o processo de criação da USB Live. O 
processo envolve a transferência opcional de uma versão (se não tiver sido 
selecionada uma), extração do ISO para o dispositivo USB, criação do 
armazenamento persistente, e instalação do 'bootloader'."
 
 #: ../liveusb/dialog.py:165
 msgid ""
@@ -609,7 +609,7 @@ msgstr "Está a utilizar uma versão antiga do 
syslinux-extlinux que não suport
 
 #: ../liveusb/gui.py:783
 msgid "You can try again to resume your download"
-msgstr "Pode tentar retomar a sua descarga"
+msgstr "Pode tentar novamente para retomar a sua transferência"
 
 #: ../liveusb/creator.py:95
 msgid "You must run this application as root"

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


[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2017-02-28 Thread translation
commit 559fd727cf1bd108dee30fba83f9c39ac60f6316
Author: Translation commit bot 
Date:   Tue Feb 28 15:45:33 2017 +

Update translations for liveusb-creator
---
 pt/pt.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index e3c494a..0387507 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -21,7 +21,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2017-02-28 14:05+\n"
+"PO-Revision-Date: 2017-02-28 15:33+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -165,7 +165,7 @@ msgstr "A transferência falhou:"
 #: ../liveusb/gui.py:89
 #, python-format
 msgid "Downloading %s..."
-msgstr "A descarregar %s..."
+msgstr "A transferir %s..."
 
 #: ../liveusb/creator.py:1192
 msgid "Drive is a loopback, skipping MBR reset"
@@ -213,7 +213,7 @@ msgstr "Não foi possível verificar a assinatura digital 
MD5 do ISO"
 msgid ""
 "If you do not select an existing Live ISO, the selected release will be "
 "downloaded for you."
-msgstr "Se não selecionar um Live ISO existente, a versão selecionada será 
descarregada."
+msgstr "Se não selecionar um ISO Live existente, a versão selecionada será 
transferida."
 
 #: ../liveusb/launcher_ui.py:154
 msgid ""
@@ -386,7 +386,7 @@ msgid ""
 "This button allows you to browse for an existing Live system ISO that you "
 "have previously downloaded.  If you do not select one, a release will be "
 "downloaded for you automatically."
-msgstr "Este botão permite-lhe procurar uma versão da ISO do sistema Live, 
previamente descarregada. Se não selecionar uma versão, a versão selecionada 
será descarregada."
+msgstr "Este botão permite-lhe procurar por um ISO do sistema Live que já 
transferiu. Se não selecionar um, a versão selecionada será transferida."
 
 #: ../liveusb/dialog.py:171
 msgid ""
@@ -394,7 +394,7 @@ msgid ""
 "optionally downloading a release (if an existing one wasn't selected),  "
 "extracting the ISO to the USB device, creating the persistent overlay, and "
 "installing the bootloader."
-msgstr "Este botão irá iniciar o processo de criação da LiveUSB. O 
processo envolve a descarga, opcional, de uma versão (se não selecionar uma 
do seu computador), seguido da extração da ISO para o dispositivo USB, criar 
o armazenamento permanente e instalar o bootloader."
+msgstr "Este botão irá iniciar o processo de criação da USB Live. O 
processo envolve a transferência opcional de uma versão (se não tiver sido 
selecionada uma), extração do ISO para o dispositivo USB, criação do 
armazenamento persistente, e instalação do 'bootloader'."
 
 #: ../liveusb/dialog.py:165
 msgid ""
@@ -609,7 +609,7 @@ msgstr "Está a utilizar uma versão antiga do 
syslinux-extlinux que não suport
 
 #: ../liveusb/gui.py:783
 msgid "You can try again to resume your download"
-msgstr "Pode tentar retomar a sua descarga"
+msgstr "Pode tentar novamente para retomar a sua transferência"
 
 #: ../liveusb/creator.py:95
 msgid "You must run this application as root"

___
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

2017-02-28 Thread translation
commit 9043f4fbd25779f24289e000745d9dd22e619991
Author: Translation commit bot 
Date:   Tue Feb 28 15:45:03 2017 +

Update translations for bridgedb
---
 pt/LC_MESSAGES/bridgedb.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po
index bf4d7d2..d0dea9c 100644
--- a/pt/LC_MESSAGES/bridgedb.po
+++ b/pt/LC_MESSAGES/bridgedb.po
@@ -22,8 +22,8 @@ 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: 2017-02-14 19:34+\n"
-"Last-Translator: Alberto Castro\n"
+"PO-Revision-Date: 2017-02-28 15:22+\n"
+"Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -113,7 +113,7 @@ msgstr "Passo %s1%s"
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "Transferir o %s Navegador Tor %s"
+msgstr "Transferir o %s Tor Browser %s"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format

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


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

2017-02-28 Thread translation
commit dc26909462724adf90c2692e8730c7aa631e7fff
Author: Translation commit bot 
Date:   Tue Feb 28 15:45:10 2017 +

Update translations for bridgedb_completed
---
 pt/LC_MESSAGES/bridgedb.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po
index bf4d7d2..d0dea9c 100644
--- a/pt/LC_MESSAGES/bridgedb.po
+++ b/pt/LC_MESSAGES/bridgedb.po
@@ -22,8 +22,8 @@ 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: 2017-02-14 19:34+\n"
-"Last-Translator: Alberto Castro\n"
+"PO-Revision-Date: 2017-02-28 15:22+\n"
+"Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -113,7 +113,7 @@ msgstr "Passo %s1%s"
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "Transferir o %s Navegador Tor %s"
+msgstr "Transferir o %s Tor Browser %s"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format

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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-02-28 Thread nickm
commit 4128a8cabdb530fcbe1dda5a21887d7728e4d752
Merge: 3a60214 b049a5b
Author: Nick Mathewson 
Date:   Tue Feb 28 10:39:29 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

This is an "ours" merge to avoid a version bump.




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


[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6

2017-02-28 Thread nickm
commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac
Merge: f7ed4a7 884b371
Author: Nick Mathewson 
Date:   Tue Feb 28 10:25:51 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

"ours" merge to avoid version bumps




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


[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm
commit e46ea4a75da3fafcb74e8d50faa3df116e1c8eda
Merge: 4dd7a55 741d2dc
Author: Nick Mathewson 
Date:   Fri Nov 13 08:41:42 2015 -0500

Merge branch 'maint-0.2.7' into release-0.2.7

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



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


[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-02-28 Thread nickm
commit e91bb84a91ff019250f19039c26df4f40c1c7544
Merge: 7a489a6 5446cb8
Author: Nick Mathewson 
Date:   Tue Feb 7 09:57:08 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7-redux

maint-0.2.7-redux is an attempt to try to re-create a plausible
maint-0.2.7 branch.  I've started from the tor-0.2.7.6, and then I
merged maint-0.2.6 into the branch.

This has produced 2 conflicts: one related to the
rendcommon->rendcache move, and one to the authority refactoring.

 changes/19271   | 2 +
 changes/bifroest| 3 +
 changes/buf-sentinel|11 +
 changes/bug17906| 4 +
 changes/bug18089| 6 +
 changes/bug18162| 7 +
 changes/bug21018|11 +
 changes/geoip-april2016 | 4 +
 changes/geoip-august2016| 4 +
 changes/geoip-december2016  | 4 +
 changes/geoip-february2016  | 4 +
 changes/geoip-january2016   | 4 +
 changes/geoip-january2017   | 4 +
 changes/geoip-july2016  | 4 +
 changes/geoip-jun2016   | 4 +
 changes/geoip-march2016 | 4 +
 changes/geoip-may2016   | 4 +
 changes/geoip-november2016  | 4 +
 changes/geoip-october2016   | 4 +
 changes/geoip-september2016 | 4 +
 changes/rsa_init_bug| 7 +
 src/common/container.c  |37 +-
 src/common/crypto.c |14 +-
 src/config/geoip| 65346 --
 src/config/geoip6   |  9935 +--
 src/or/buffers.c|40 +-
 src/or/config.c | 9 +-
 src/or/main.c   | 1 -
 src/or/rendcache.c  | 6 +-
 src/or/routerparse.c| 6 +-
 30 files changed, 57683 insertions(+), 17814 deletions(-)

diff --cc src/or/config.c
index fa860af,233940e..3094a1d
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -857,41 -841,6 +857,38 @@@ escaped_safe_str(const char *address
  return escaped(address);
  }
  
 +/** List of default directory authorities */
 +
 +static const char *default_authorities[] = {
 +  "moria1 orport=9101 "
 +"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
 +"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
 +  "tor26 orport=443 "
 +"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
 +"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
 +  "dizum orport=443 "
 +"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
 +"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-   "Tonga orport=443 bridge "
- "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
++  "Bifroest orport=443 bridge "
++"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
 +  "gabelmoo orport=443 "
 +"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 +  "dannenberg orport=443 "
- "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
++"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
 +"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-   "urras orport=80 "
- "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
- "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
 +  "maatuska orport=80 "
 +"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
 +"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
 +  "Faravahar orport=443 "
 +"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
 +"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
 +  "longclaw orport=443 "
 +"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
 +"199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
 +  NULL
 +};
 +
  /** Add the default directory authorities directly into the trusted dir list,
   * but only add them insofar as they share bits with type.
   * Each authority's bits are restricted to the bits shared with type.
diff --cc src/or/rendcache.c
index d4bdd68,000..e7b1ce9
mode 100644,00..100644
--- a/src/or/rendcache.c
+++ b/src/or/rendcache.c
@@@ -1,898 -1,0 +1,900 @@@
 +/* Copyright (c) 2015, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file rendcache.c
 + * \brief Hidden service desriptor cache.
 + **/
 +
 +#include "rendcache.h"
 +
 +#include "config.h"
 +#include "rephist.h"
 +#include "routerlist.h"
 +#include "routerparse.h"
 +
 +/** Map from service id (as generated by rend_get_service_id) to
 + * rend_cache_entry_t. */
 +static strmap_t *rend_cache = NULL;
 +
 +/** Map from descriptor id to rend_cache_entry_t; only for hidden service
 + * directories. */
 +static digestmap_t *rend_cache_v2_dir = NULL;
 +
 +/** (Client side only) Map from service id to rend_cache_failure_t. This
 + * cache is used to track intro point(IP) failures so we know when to keep
 + * or discard a new 

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-02-28 Thread nickm
commit 8a1f0876ed329f6c9d73e6ca786cd8437e6bb55b
Merge: 3f5a710 f2a3041
Author: Nick Mathewson 
Date:   Tue Feb 7 10:38:05 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7-redux

 changes/bug16248 |  8 
 changes/bug18710 |  6 ++
 src/or/dnsserv.c |  4 +---
 src/or/main.c| 55 +++
 4 files changed, 66 insertions(+), 7 deletions(-)




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


[tor-commits] [tor/release-0.2.8] remove a comma that coderman didn't like

2017-02-28 Thread nickm
commit f55d23e1e66e9b0f6971016a9c880341e0209db0
Author: Nick Mathewson 
Date:   Wed Oct 21 15:13:31 2015 -0400

remove a comma that coderman didn't like
---
 ChangeLog | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5226fef..0e6fe6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,9 +38,8 @@ Changes in version 0.2.7.4-rc - 2015-10-21
   bugfix on 0.2.5.1-alpha. Patch from 'jamestk'.
 
   o Minor bugfixes (portability):
-- Use libexecinfo on FreeBSD, to enable backtrace support. Fixes
-  part of bug 17151; bugfix on 0.2.5.2-alpha. Patch from
-  Marcin Cieślak.
+- Use libexecinfo on FreeBSD to enable backtrace support. Fixes part
+  of bug 17151; bugfix on 0.2.5.2-alpha. Patch from Marcin Cieślak.
 
   o Minor bugfixes (sandbox):
 - Add the "hidserv-stats" filename to our sandbox filter for the



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


[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm
commit ff174995f07747628ad1e71fd344fc27e88a70ed
Merge: fbaee1b 5d45a26
Author: Nick Mathewson 
Date:   Wed Oct 21 11:06:47 2015 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug17398|  3 +++
 changes/bug17401|  3 +++
 changes/bug17402|  3 +++
 src/common/crypto_ed25519.c |  1 +
 src/or/rendcache.c  | 24 
 5 files changed, 26 insertions(+), 8 deletions(-)



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


[tor-commits] [tor/release-0.2.8] add a dedication paragraph; reflow another.

2017-02-28 Thread nickm
commit 0549c019675840171fb764c8bb593309534ccadc
Author: Nick Mathewson 
Date:   Fri Nov 13 08:58:18 2015 -0500

add a dedication paragraph; reflow another.
---
 ReleaseNotes | 23 ++-
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/ReleaseNotes b/ReleaseNotes
index ef173af..3540497 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,19 +1,32 @@
-
 This document summarizes new features and bugfixes in each stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
 Changes in version 0.2.7.5 - 2015-11-1?
+  The Tor 0.2.7 release series is dedicated to the memory of Tor user
+  and privacy advocate Caspar Bowden (1961-2015). Caspar worked
+  tirelessly to advocate human rights regardless of national borders,
+  and oppose the encroachments of mass surveillance. He opposed national
+  exceptionalism; he brought clarity to legal and policy debates; he
+  understood and predicted the impact of mass surveillance on the world;
+  and he laid the groundwork for resisting it. While serving on the Tor
+  Project's board of directors, he brought us his uncompromising focus
+  on technical excellence in the service of humankind. Caspar was an
+  inimitable force for good and a wonderful friend. He was kind,
+  humorous, generous, gallant, and believed we should protect one
+  another without exception. We honor him here for his ideals, his
+  efforts, and his accomplishments. Please honor his memory with works
+  that would make him proud.
+
   Tor 0.2.7.5 is the first stable release in the Tor 0.2.7 series.
 
   The 0.2.7 series adds a more secure identity key type for relays,
   improves cryptography performance, resolves several longstanding
   hidden-service performance issues, improves controller support for
   hidden services, and includes small bugfixes and performance
-  improvements throughout the program.  This release series also
-  includes more tests than before, and significant simplifications
-  to which parts of Tor invoke which others.  For a full list of
-  changes, see below.
+  improvements throughout the program. This release series also includes
+  more tests than before, and significant simplifications to which parts
+  of Tor invoke which others. For a full list of changes, see below.
 
   o New system requirements:
 - Tor no longer includes workarounds to support Libevent versions



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


[tor-commits] [tor/release-0.2.8] Edit more changelog text (thanks to rl1987 for noticing)

2017-02-28 Thread nickm
commit 08b96160fc39720cbe3a2a2e2aa51694e303bb08
Author: Nick Mathewson 
Date:   Wed Oct 21 14:42:47 2015 -0400

Edit more changelog text (thanks to rl1987 for noticing)
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d40010..afddbba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,7 +45,7 @@ Changes in version 0.2.7.4-rc - 2015-10-21
   o Minor bugfixes (sandbox):
 - Add the "hidserv-stats" filename to our sandbox filter for the
   HiddenServiceStatistics option to work properly. Fixes bug 17354;
-  bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet.
+  bugfix on tor-0.2.6.2-alpha. Patch from David Goulet.
 
   o Minor bugfixes (testing):
 - Add unit tests for get_interface_address* failure cases. Fixes bug
@@ -54,7 +54,7 @@ Changes in version 0.2.7.4-rc - 2015-10-21
   17154; bugfix on 0.2.7.3-rc. Patch by Marcin Cieślak.
 - Make the get_ifaddrs_* unit tests more tolerant of different
   network configurations. (Don't assume every test box has an IPv4
-  address, and Don't assume every test box has a non-localhost
+  address, and don't assume every test box has a non-localhost
   address.) Fixes bug 17255; bugfix on 0.2.7.3-rc. Patch by "teor".
 - Skip backtrace tests when backtrace support is not compiled in.
   Fixes part of bug 17151; bugfix on 0.2.7.1-alpha. Patch from



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


[tor-commits] [tor/release-0.2.8] start trying to write a blurb

2017-02-28 Thread nickm
commit 4dd7a55cf22caa56ef53609e2545002733803a56
Author: Nick Mathewson 
Date:   Tue Nov 10 09:13:58 2015 -0500

start trying to write a blurb
---
 ReleaseNotes | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ReleaseNotes b/ReleaseNotes
index 029dd61..ef173af 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -3,8 +3,17 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
-Changes in version 0.2.7.5- 2015-11-??
-   WRITE A BLURB 
+Changes in version 0.2.7.5 - 2015-11-1?
+  Tor 0.2.7.5 is the first stable release in the Tor 0.2.7 series.
+
+  The 0.2.7 series adds a more secure identity key type for relays,
+  improves cryptography performance, resolves several longstanding
+  hidden-service performance issues, improves controller support for
+  hidden services, and includes small bugfixes and performance
+  improvements throughout the program.  This release series also
+  includes more tests than before, and significant simplifications
+  to which parts of Tor invoke which others.  For a full list of
+  changes, see below.
 
   o New system requirements:
 - Tor no longer includes workarounds to support Libevent versions



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


[tor-commits] [tor/release-0.3.0] bump version to 0.2.8.13

2017-02-28 Thread nickm
commit f2a657c22bf47fe4fd8103a1117e1e46af30969c
Author: Nick Mathewson 
Date:   Tue Feb 28 10:34:33 2017 -0500

bump version to 0.2.8.13
---
 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 200ea02..9c6d95d 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.8.12-dev])
+AC_INIT([tor],[0.2.8.13])
 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 7152e43..ae477b8 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.8.12-dev"
+!define VERSION "0.2.8.13"
 !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 26f9950..b61f59f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.12-dev"
+#define VERSION "0.2.8.13"
 
 
 



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


[tor-commits] [tor/release-0.2.8] bump version to 0.2.8.13

2017-02-28 Thread nickm
commit f2a657c22bf47fe4fd8103a1117e1e46af30969c
Author: Nick Mathewson 
Date:   Tue Feb 28 10:34:33 2017 -0500

bump version to 0.2.8.13
---
 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 200ea02..9c6d95d 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.8.12-dev])
+AC_INIT([tor],[0.2.8.13])
 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 7152e43..ae477b8 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.8.12-dev"
+!define VERSION "0.2.8.13"
 !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 26f9950..b61f59f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.12-dev"
+#define VERSION "0.2.8.13"
 
 
 



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


[tor-commits] [tor/release-0.2.8] Reflow changelog

2017-02-28 Thread nickm
commit 5f60216b3b7bbe335f6e0f07452b46c38bb97d0c
Author: Nick Mathewson 
Date:   Wed Oct 21 15:10:21 2015 -0400

Reflow changelog
---
 ChangeLog | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afddbba..5226fef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,15 @@
 Changes in version 0.2.7.4-rc - 2015-10-21
-  Tor 0.2.7.4-rc is the second release candidate in the 0.2.7 series.
-  It fixes some important memory leaks, and a scary-looking (but mostly
-  harmless in practice) invalid-read bug.  It also has a few small
+  Tor 0.2.7.4-rc is the second release candidate in the 0.2.7 series. It
+  fixes some important memory leaks, and a scary-looking (but mostly
+  harmless in practice) invalid-read bug. It also has a few small
   bugfixes, notably fixes for compilation and portability on different
   platforms. If no further significant bounds are found, the next
   release will the the official stable release.
 
   o Major bugfixes (security, correctness):
-- Fix an error that could cause us to read 4 bytes before
-  the beginning of an openssl string. This bug could be used to
-  cause Tor to crash on systems with unusual malloc implementations, or
+- Fix an error that could cause us to read 4 bytes before the
+  beginning of an openssl string. This bug could be used to cause
+  Tor to crash on systems with unusual malloc implementations, or
   systems with unusual hardening installed. Fixes bug 17404; bugfix
   on 0.2.3.6-alpha.
 



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


[tor-commits] [tor/release-0.2.8] Revert "Revert "Add hidserv-stats filname to our sandbox filter""

2017-02-28 Thread nickm
commit 3f5a710958bfa2e6d1c2a6d78b0718514f2f7350
Author: Nick Mathewson 
Date:   Tue Feb 7 10:13:20 2017 -0500

Revert "Revert "Add hidserv-stats filname to our sandbox filter""

This reverts commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661.

The underlying revert was done in 0.2.6, since we aren't backporting
seccomp2 loosening fixes to 0.2.6.  But the fix (for 17354) already
went out in 0.2.7.4-rc, so we shouldn't revert it in 0.2.7.
---
 changes/bug17354 | 4 
 src/or/main.c| 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bug17354 b/changes/bug17354
new file mode 100644
index 000..53da007
--- /dev/null
+++ b/changes/bug17354
@@ -0,0 +1,4 @@
+  o Minor bugfixes (sandbox):
+- Add the "hidserv-stats" filename to our sandbox filter for the
+  HiddenServiceStatistics option to work properly. Fixes bug 17354;
+  bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet.
diff --git a/src/or/main.c b/src/or/main.c
index 693d13c..9b3dbb5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3200,6 +3200,7 @@ sandbox_init_filter(void)
 RENAME_SUFFIX2("stats", "exit-stats", ".tmp");
 RENAME_SUFFIX2("stats", "buffer-stats", ".tmp");
 RENAME_SUFFIX2("stats", "conn-stats", ".tmp");
+RENAME_SUFFIX2("stats", "hidserv-stats", ".tmp");
 RENAME_SUFFIX("hashed-fingerprint", ".tmp");
 RENAME_SUFFIX("router-stability", ".tmp");
 



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


[tor-commits] [tor/release-0.3.0] bump version to 0.2.9.10

2017-02-28 Thread nickm
commit b049a5b3989ab72c4e87ecd029fc1e6886f61371
Author: Nick Mathewson 
Date:   Tue Feb 28 10:38:55 2017 -0500

bump version to 0.2.9.10
---
 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 f7bdd97..095f374 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.9-dev])
+AC_INIT([tor],[0.2.9.10])
 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 91eb5f2..987aa01 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.9-dev"
+!define VERSION "0.2.9.10"
 !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 80d5cf0..540cfab 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.9-dev"
+#define VERSION "0.2.9.10"
 
 
 



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


[tor-commits] [tor/release-0.3.0] bump version to 0.3.0.4-rc

2017-02-28 Thread nickm
commit 58908b6540d7296109b60e187ff788b20e79aba5
Author: Nick Mathewson 
Date:   Tue Feb 28 10:40:08 2017 -0500

bump version to 0.3.0.4-rc
---
 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 c9e0c2a..4433d57 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.3.0.3-alpha-dev])
+AC_INIT([tor],[0.3.0.4-rc])
 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 62e8036..a7fd0d3 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.3.0.3-alpha-dev"
+!define VERSION "0.3.0.4-rc"
 !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 ec4d62b..5542452 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.3.0.3-alpha-dev"
+#define VERSION "0.3.0.4-rc"
 
 
 



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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-02-28 Thread nickm
commit cf9844fcfa5387e054dff55d5ad0bfd538b4cec3
Merge: d6b6257 58908b6
Author: Nick Mathewson 
Date:   Tue Feb 28 10:40:20 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-02-28 Thread nickm
commit 3e07a54928c3b14b4eb86b05251564c3e16504c4
Merge: 67cec75 f93bcab
Author: Nick Mathewson 
Date:   Tue Feb 28 10:38:31 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

This is an "ours" merge to avoid taking a version bump




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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

2017-02-28 Thread nickm
commit f93bcab60e09618bf5b9ec55c6f4f338f2a7cd06
Merge: f2a657c b5526be
Author: Nick Mathewson 
Date:   Tue Feb 28 10:37:25 2017 -0500

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

This is an "ours" merge to avoid taking a version bump, and to
avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto 
maint-0.2.8, which already included the relevant changes.




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


[tor-commits] [tor/release-0.3.0] Bump version to 0.2.5.13

2017-02-28 Thread nickm
commit 884b3717a92465a3d6ab31d819e4011d3d929b3c
Author: Nick Mathewson 
Date:   Tue Feb 28 10:23:20 2017 -0500

Bump version to 0.2.5.13
---
 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 29ba2fd..8f85dae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2013, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.5.12])
+AC_INIT([tor],[0.2.5.13])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 2fb15b8..9661e10 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.5.12"
+!define VERSION "0.2.5.13"
 !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 6d6cde4..aa04092 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.5.12"
+#define VERSION "0.2.5.13"
 
 
 



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


[tor-commits] [tor/release-0.3.0] Revert "Revert "Add hidserv-stats filname to our sandbox filter""

2017-02-28 Thread nickm
commit 3f5a710958bfa2e6d1c2a6d78b0718514f2f7350
Author: Nick Mathewson 
Date:   Tue Feb 7 10:13:20 2017 -0500

Revert "Revert "Add hidserv-stats filname to our sandbox filter""

This reverts commit 5446cb8d3d536e9bc737de6d9286bd4b4b185661.

The underlying revert was done in 0.2.6, since we aren't backporting
seccomp2 loosening fixes to 0.2.6.  But the fix (for 17354) already
went out in 0.2.7.4-rc, so we shouldn't revert it in 0.2.7.
---
 changes/bug17354 | 4 
 src/or/main.c| 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bug17354 b/changes/bug17354
new file mode 100644
index 000..53da007
--- /dev/null
+++ b/changes/bug17354
@@ -0,0 +1,4 @@
+  o Minor bugfixes (sandbox):
+- Add the "hidserv-stats" filename to our sandbox filter for the
+  HiddenServiceStatistics option to work properly. Fixes bug 17354;
+  bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet.
diff --git a/src/or/main.c b/src/or/main.c
index 693d13c..9b3dbb5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3200,6 +3200,7 @@ sandbox_init_filter(void)
 RENAME_SUFFIX2("stats", "exit-stats", ".tmp");
 RENAME_SUFFIX2("stats", "buffer-stats", ".tmp");
 RENAME_SUFFIX2("stats", "conn-stats", ".tmp");
+RENAME_SUFFIX2("stats", "hidserv-stats", ".tmp");
 RENAME_SUFFIX("hashed-fingerprint", ".tmp");
 RENAME_SUFFIX("router-stability", ".tmp");
 



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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-02-28 Thread nickm
commit e91bb84a91ff019250f19039c26df4f40c1c7544
Merge: 7a489a6 5446cb8
Author: Nick Mathewson 
Date:   Tue Feb 7 09:57:08 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7-redux

maint-0.2.7-redux is an attempt to try to re-create a plausible
maint-0.2.7 branch.  I've started from the tor-0.2.7.6, and then I
merged maint-0.2.6 into the branch.

This has produced 2 conflicts: one related to the
rendcommon->rendcache move, and one to the authority refactoring.

 changes/19271   | 2 +
 changes/bifroest| 3 +
 changes/buf-sentinel|11 +
 changes/bug17906| 4 +
 changes/bug18089| 6 +
 changes/bug18162| 7 +
 changes/bug21018|11 +
 changes/geoip-april2016 | 4 +
 changes/geoip-august2016| 4 +
 changes/geoip-december2016  | 4 +
 changes/geoip-february2016  | 4 +
 changes/geoip-january2016   | 4 +
 changes/geoip-january2017   | 4 +
 changes/geoip-july2016  | 4 +
 changes/geoip-jun2016   | 4 +
 changes/geoip-march2016 | 4 +
 changes/geoip-may2016   | 4 +
 changes/geoip-november2016  | 4 +
 changes/geoip-october2016   | 4 +
 changes/geoip-september2016 | 4 +
 changes/rsa_init_bug| 7 +
 src/common/container.c  |37 +-
 src/common/crypto.c |14 +-
 src/config/geoip| 65346 --
 src/config/geoip6   |  9935 +--
 src/or/buffers.c|40 +-
 src/or/config.c | 9 +-
 src/or/main.c   | 1 -
 src/or/rendcache.c  | 6 +-
 src/or/routerparse.c| 6 +-
 30 files changed, 57683 insertions(+), 17814 deletions(-)

diff --cc src/or/config.c
index fa860af,233940e..3094a1d
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -857,41 -841,6 +857,38 @@@ escaped_safe_str(const char *address
  return escaped(address);
  }
  
 +/** List of default directory authorities */
 +
 +static const char *default_authorities[] = {
 +  "moria1 orport=9101 "
 +"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
 +"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
 +  "tor26 orport=443 "
 +"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
 +"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
 +  "dizum orport=443 "
 +"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
 +"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-   "Tonga orport=443 bridge "
- "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
++  "Bifroest orport=443 bridge "
++"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
 +  "gabelmoo orport=443 "
 +"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 +  "dannenberg orport=443 "
- "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
++"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
 +"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-   "urras orport=80 "
- "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
- "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
 +  "maatuska orport=80 "
 +"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
 +"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
 +  "Faravahar orport=443 "
 +"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
 +"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
 +  "longclaw orport=443 "
 +"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
 +"199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
 +  NULL
 +};
 +
  /** Add the default directory authorities directly into the trusted dir list,
   * but only add them insofar as they share bits with type.
   * Each authority's bits are restricted to the bits shared with type.
diff --cc src/or/rendcache.c
index d4bdd68,000..e7b1ce9
mode 100644,00..100644
--- a/src/or/rendcache.c
+++ b/src/or/rendcache.c
@@@ -1,898 -1,0 +1,900 @@@
 +/* Copyright (c) 2015, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file rendcache.c
 + * \brief Hidden service desriptor cache.
 + **/
 +
 +#include "rendcache.h"
 +
 +#include "config.h"
 +#include "rephist.h"
 +#include "routerlist.h"
 +#include "routerparse.h"
 +
 +/** Map from service id (as generated by rend_get_service_id) to
 + * rend_cache_entry_t. */
 +static strmap_t *rend_cache = NULL;
 +
 +/** Map from descriptor id to rend_cache_entry_t; only for hidden service
 + * directories. */
 +static digestmap_t *rend_cache_v2_dir = NULL;
 +
 +/** (Client side only) Map from service id to rend_cache_failure_t. This
 + * cache is used to track intro point(IP) failures so we know when to keep
 + * or discard a new 

[tor-commits] [tor/release-0.3.0] Bump version to 0.2.7.7

2017-02-28 Thread nickm
commit b5526bef384524badbd1411ad9570e6373438b06
Author: Nick Mathewson 
Date:   Tue Feb 28 10:27:20 2017 -0500

Bump version to 0.2.7.7
---
 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 d37c34d..80c4d3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.7.6-dev])
+AC_INIT([tor],[0.2.7.7])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 08cef8d..f20c1a6 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.7.6-dev"
+!define VERSION "0.2.7.7"
 !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 8b687c8..57385c9 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -232,7 +232,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.7.6-dev"
+#define VERSION "0.2.7.7"
 
 
 



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


[tor-commits] [tor/release-0.3.0] Bump to 0.2.4.28

2017-02-28 Thread nickm
commit 4bab288a822a5312ee2953822563e694c7274afb
Author: Nick Mathewson 
Date:   Tue Feb 28 10:20:46 2017 -0500

Bump to 0.2.4.28
---
 configure.ac | 2 +-
 contrib/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 6ffe3cc..8e70722 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2013, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.4.27])
+AC_INIT([tor],[0.2.4.28])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index a66bcd1..da24244 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.4.27"
+!define VERSION "0.2.4.28"
 !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 baddef6..cca8ad0 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.4.27"
+#define VERSION "0.2.4.28"
 
 
 



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


[tor-commits] [tor/release-0.3.0] Use the correct bug #. For real this time. Thanks again, skruffy

2017-02-28 Thread nickm
commit 7a489a638911012069981702065b952a5809d249
Author: Nick Mathewson 
Date:   Thu Dec 10 11:20:24 2015 -0500

Use the correct bug #. For real this time. Thanks again, skruffy
---
 ChangeLog| 2 +-
 ReleaseNotes | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bfa5673..a71f900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ Changes in version 0.2.7.6 - 2015-12-10
   guard. When we implemented the directory guard design, we
   accidentally started treating all relays as if they have the Guard
   flag during guard selection, leading to weaker anonymity and worse
-  performance. Fixes bug 17722; bugfix on 0.2.4.8-alpha. Discovered
+  performance. Fixes bug 17772; bugfix on 0.2.4.8-alpha. Discovered
   by Mohsen Imani.
 
   o Minor features (geoip):
diff --git a/ReleaseNotes b/ReleaseNotes
index 8fe6359..f16a46a 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -11,7 +11,7 @@ Changes in version 0.2.7.6 - 2015-12-10
   guard. When we implemented the directory guard design, we
   accidentally started treating all relays as if they have the Guard
   flag during guard selection, leading to weaker anonymity and worse
-  performance. Fixes bug 17722; bugfix on 0.2.4.8-alpha. Discovered
+  performance. Fixes bug 17772; bugfix on 0.2.4.8-alpha. Discovered
   by Mohsen Imani.
 
   o Minor features (geoip):



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


[tor-commits] [tor/release-0.3.0] bump to 0.2.6.11

2017-02-28 Thread nickm
commit 57e778f882537b5c07465e87f763bcd032cc7ea1
Author: Nick Mathewson 
Date:   Tue Feb 28 10:26:24 2017 -0500

bump to 0.2.6.11
---
 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 3654024..a79ea82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.6.10-dev])
+AC_INIT([tor],[0.2.6.11])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4143cf4..6611bb8 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.6.10-dev"
+!define VERSION "0.2.6.11"
 !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 82e7e65..59cd43e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -232,7 +232,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.6.10-dev"
+#define VERSION "0.2.6.11"
 
 
 



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


[tor-commits] [tor/release-0.3.0] Use the correct bug #. Thanks, skruffy

2017-02-28 Thread nickm
commit 1979414f0fb225e6c04f2ae473b47674c3b23510
Author: Nick Mathewson 
Date:   Thu Dec 10 11:08:35 2015 -0500

Use the correct bug #. Thanks, skruffy
---
 ChangeLog| 2 +-
 ReleaseNotes | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 64c86ff..bfa5673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ Changes in version 0.2.7.6 - 2015-12-10
   guard. When we implemented the directory guard design, we
   accidentally started treating all relays as if they have the Guard
   flag during guard selection, leading to weaker anonymity and worse
-  performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered
+  performance. Fixes bug 17722; bugfix on 0.2.4.8-alpha. Discovered
   by Mohsen Imani.
 
   o Minor features (geoip):
diff --git a/ReleaseNotes b/ReleaseNotes
index a399a21..8fe6359 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -11,7 +11,7 @@ Changes in version 0.2.7.6 - 2015-12-10
   guard. When we implemented the directory guard design, we
   accidentally started treating all relays as if they have the Guard
   flag during guard selection, leading to weaker anonymity and worse
-  performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered
+  performance. Fixes bug 17722; bugfix on 0.2.4.8-alpha. Discovered
   by Mohsen Imani.
 
   o Minor features (geoip):



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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.6

2017-02-28 Thread nickm
commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac
Merge: f7ed4a7 884b371
Author: Nick Mathewson 
Date:   Tue Feb 28 10:25:51 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

"ours" merge to avoid version bumps




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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-02-28 Thread nickm
commit aec45bc0b1d5c694b107373f8d6e3ddd1372defc
Merge: 8a1f087 f7ed4a7
Author: Nick Mathewson 
Date:   Fri Feb 17 17:10:47 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7-redux

 changes/bug20384   |10 +
 changes/geoip-february2017 | 4 +
 changes/trove-2017-001.2   | 8 +
 src/config/geoip   | 10832 ---
 src/config/geoip6  |  1651 ++-
 src/or/routerparse.c   |49 +-
 6 files changed, 7399 insertions(+), 5155 deletions(-)




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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

2017-02-28 Thread nickm
commit b2b604ecb4df95526a309c9ff507dff942472daa
Merge: aeb299b 4bab288
Author: Nick Mathewson 
Date:   Tue Feb 28 10:22:36 2017 -0500

Merge branch 'maint-0.2.4' into maint-0.2.5

"ours" merge to avoid bumping version




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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.7' into release-0.2.7

2017-02-28 Thread nickm
commit f01f8e18b80b195f49cb48561b85f6eaae85e8cb
Merge: 6f3f753 7fb19f1
Author: Nick Mathewson 
Date:   Thu Dec 10 10:05:08 2015 -0500

Merge branch 'maint-0.2.7' into release-0.2.7

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



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


[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-02-28 Thread nickm
commit 1174b50cab48be08b321deced0cfa022160d2c40
Merge: aec45bc 57e778f
Author: Nick Mathewson 
Date:   Tue Feb 28 10:26:45 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7-redux

"ours" merge to avoid version bumps




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


[tor-commits] [tor/release-0.3.0] fold in the changes entries

2017-02-28 Thread nickm
commit 9236e504155eb2a32b34f94fd8d7aa80b47d8636
Author: Roger Dingledine 
Date:   Thu Dec 10 08:14:58 2015 -0500

fold in the changes entries
---
 ChangeLog  | 35 +++
 changes/bug16056   |  4 
 changes/bug16702   |  4 
 changes/bug17551   |  4 
 changes/bug17722   |  3 ---
 changes/bug17772   |  7 ---
 changes/bug17781   |  3 ---
 changes/geoip-december2015 |  4 
 8 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index acfa034..9326673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+Changes in version 0.2.7.6 - 2015-12-10
+  Tor version 0.2.7.6 fixes a major bug in entry guard selection, as
+  well as a minor bug in hidden service reliability.
+
+  o Major bugfixes:
+- Actually look at the Guard flag when selecting a new directory
+  guard. When we implemented the directory guard design, we
+  accidentally started treating all relays as if they have the Guard
+  flag during guard selection, leading to weaker anonymity and worse
+  performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered
+  by Mohsen Imani.
+
+  o Minor bugfixes (correctness):
+- When displaying an IPv6 exit policy, include the mask bits correctly
+  even when the number is greater than 31. Fixes bug 16056; bugfix on
+  0.2.4.7-alpha. Patch from "gturner".
+- The wrong list was used when looking up expired intro points in
+  a rend service object, causing what we think could be reachability
+  issues for hidden services, and triggering a BUG log. Fixes bug
+  16702; bugfix on 0.2.7.2-alpha.
+- Fix undefined behavior in the tor_cert_checksig function. Fixes bug
+  17722; bugfix on 0.2.7.2-alpha.
+
+  o Minor bugfixes (compilation):
+- When checking for net/pfvar.h, include netinet/in.h if possible.
+  This fixes transparent proxy detection on OpenBSD. Fixes bug
+  17551; bugfix on 0.1.2.1-alpha. Patch from "rubiate".
+- Fix a compilation warning with Clang 3.6: Do not check the
+  presence of an address which can never be NULL. Fixes bug 17781.
+
+  o Minor features:
+- Update geoip and geoip6 to the December 1 2015 Maxmind GeoLite2
+  Country database.
+
+
 Changes in version 0.2.7.5 - 2015-11-20
   The Tor 0.2.7 release series is dedicated to the memory of Tor user
   and privacy advocate Caspar Bowden (1961-2015). Caspar worked
diff --git a/changes/bug16056 b/changes/bug16056
deleted file mode 100644
index e3311c0..000
--- a/changes/bug16056
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (relay, IPv6):
-- When displaying an IPv6 exit policy, include the mask bits correctly
-  even when the number is greater than 31. Fixes bug 16056; bugfix on
-  0.2.4.7-alpha. Patch from "gturner".
\ No newline at end of file
diff --git a/changes/bug16702 b/changes/bug16702
deleted file mode 100644
index 5de36cd..000
--- a/changes/bug16702
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (hidden service)
-- The wrong list was used when looking up expired intro points in a rend
-  service object causing what we think could be reachability issues and
-  triggering a BUG log. Fixes 16702; bugfix on tor-0.2.7.2-alpha.
diff --git a/changes/bug17551 b/changes/bug17551
deleted file mode 100644
index 27e4679..000
--- a/changes/bug17551
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-- When checking for net/pfvar.h, include netinet/in.h if possible.
-  This fixes transparent proxy detection on OpenBSD. Fixes bug
-  17551; bugfix on 0.1.2.1-alpha. Patch from "rubiate".
diff --git a/changes/bug17722 b/changes/bug17722
deleted file mode 100644
index 1b18d4a..000
--- a/changes/bug17722
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (code correctness)
-- Fix undefined behavior in the tor_cert_checksig function. Fixes bug
-  17722; bugfix on tor-0.2.7.2-alpha.
diff --git a/changes/bug17772 b/changes/bug17772
deleted file mode 100644
index 54d457c..000
--- a/changes/bug17772
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes (guard selection):
-- Actually look at the Guard flag when selecting a new directory
-  guard. When we implemented the directory guard design, we
-  accidentally started treating all relays as if they have the Guard
-  flag during guard selection, leading to weaker anonymity and worse
-  performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered
-  by Mohsen Imani.
diff --git a/changes/bug17781 b/changes/bug17781
deleted file mode 100644
index 01ed231..000
--- a/changes/bug17781
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Compilation fixes:
-- Fix a compilation warning with Clang 3.6: Do not check the
-  presence of an address which can never be NULL. Fixes bug 17781.
diff --git a/changes/geoip-december2015 b/changes/geoip-december2015
deleted file 

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

2017-02-28 Thread nickm
commit 8a1f0876ed329f6c9d73e6ca786cd8437e6bb55b
Merge: 3f5a710 f2a3041
Author: Nick Mathewson 
Date:   Tue Feb 7 10:38:05 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7-redux

 changes/bug16248 |  8 
 changes/bug18710 |  6 ++
 src/or/dnsserv.c |  4 +---
 src/or/main.c| 55 +++
 4 files changed, 66 insertions(+), 7 deletions(-)




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


[tor-commits] [tor/release-0.3.0] Bump the version to 0.2.7.6-dev again

2017-02-28 Thread nickm
commit 5b60bd84f258af4bcf6a993bce76ad382a99ec91
Author: Nick Mathewson 
Date:   Tue Feb 7 09:59:54 2017 -0500

Bump the version to 0.2.7.6-dev again
---
 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 6c72971..d37c34d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.7.6])
+AC_INIT([tor],[0.2.7.6-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 07cc315..08cef8d 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.7.6"
+!define VERSION "0.2.7.6-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 822e261..8b687c8 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -232,7 +232,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.7.6"
+#define VERSION "0.2.7.6-dev"
 
 
 



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


  1   2   3   4   5   >