[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

[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

[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 +

[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

[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

[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. ---

[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

[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

[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

[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

[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

[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

[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

[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(+)

[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

[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

[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

[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

[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

[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

[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 +++

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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

[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] [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

[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

[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

[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

[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

[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

[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

[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 ++

[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 +-

[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

[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

[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 +-

[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 --

[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 +-

[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

[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

[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

[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

[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 +

[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 ---

[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

[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

[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

[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

[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] [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] [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 +-

[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

[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

[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

[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 +++

[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

[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

[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

[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 +-

[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 +-

[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

[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

[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 +-

[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

[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 +-

[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] [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

[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 +-

[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

[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

[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 +-

[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

[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(-)

[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

[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

[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] [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 +

[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] [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 +-

[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] [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

[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

[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

  1   2   3   4   5   >