[tor-commits] [stem/master] Drop test assertion about HS key length

2018-03-03 Thread atagar
commit 3e1414f819441328d80fb972547a4fadd28f1479 Author: Damian Johnson Date: Sat Mar 3 16:18:15 2018 -0800 Drop test assertion about HS key length Jenkins tests failed. Seems the length of these can vary a bit after all. --- test/integ/control/controller.py

[tor-commits] [stem/master] Document v3 hidden service support

2018-03-03 Thread atagar
commit 53e73ad8ac9ad8af54ca64d57895b2b35ad9ee5f Author: Damian Johnson Date: Sat Mar 3 15:58:35 2018 -0800 Document v3 hidden service support Huh, didn't expect that. Unless I'm missing something there isn't much for us to do in Stem for v3 Hidden

[tor-commits] [tor/master] tweak changelog for 4187

2018-03-03 Thread nickm
commit e5a990fc5a5440b48e49029e937c852fc45f246b Author: Nick Mathewson Date: Sat Mar 3 12:02:45 2018 -0500 tweak changelog for 4187 --- changes/ticket4187 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/ticket4187

[tor-commits] [tor/master] Merge remote-tracking branch 'fristonio/ticket4187'

2018-03-03 Thread nickm
commit df9d2de44119e09e8fc485c6ff57ca01c226abd1 Merge: 338dbdab9 1c8f55310 Author: Nick Mathewson Date: Sat Mar 3 12:02:30 2018 -0500 Merge remote-tracking branch 'fristonio/ticket4187' changes/ticket4187 | 3 +++ src/or/networkstatus.c | 11 ++- 2

[tor-commits] [tor/master] Rename a verified unverified-consensus to cached-consensus on the disk

2018-03-03 Thread nickm
commit 1c8f55310f6a9969dc8ae5e8566e971fd2ac50b4 Author: Deepesh Pathak Date: Sat Feb 3 06:45:52 2018 +0530 Rename a verified unverified-consensus to cached-consensus on the disk - Fixes ticket #4187 - Change the name of a unverified-*consensus to

[tor-commits] [tor/maint-0.3.3] changes file for 25378

2018-03-03 Thread nickm
commit ccf0f77da1894a11502fa36767838f687a4494d9 Author: Nick Mathewson Date: Sat Mar 3 11:58:22 2018 -0500 changes file for 25378 --- changes/bug25378 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug25378 b/changes/bug25378 new file mode 100644

[tor-commits] [tor/master] Update tor.1.txt with the currently available log domains.

2018-03-03 Thread nickm
commit 59a7b00384a6e5fb905b064faed62c5b969ffebd Author: Alexander Færøy Date: Tue Feb 27 22:57:30 2018 +0100 Update tor.1.txt with the currently available log domains. See: https://bugs.torproject.org/25378 --- doc/tor.1.txt| 3 ++- src/common/log.c | 5

[tor-commits] [tor/release-0.3.3] Update tor.1.txt with the currently available log domains.

2018-03-03 Thread nickm
commit 59a7b00384a6e5fb905b064faed62c5b969ffebd Author: Alexander Færøy Date: Tue Feb 27 22:57:30 2018 +0100 Update tor.1.txt with the currently available log domains. See: https://bugs.torproject.org/25378 --- doc/tor.1.txt| 3 ++- src/common/log.c | 5

[tor-commits] [tor/release-0.3.3] changes file for 25378

2018-03-03 Thread nickm
commit ccf0f77da1894a11502fa36767838f687a4494d9 Author: Nick Mathewson Date: Sat Mar 3 11:58:22 2018 -0500 changes file for 25378 --- changes/bug25378 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug25378 b/changes/bug25378 new file mode 100644

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

2018-03-03 Thread nickm
commit 6d44cf66c7cca6e0aba5c7afb00683c98187ea60 Merge: ac93889ee ccf0f77da Author: Nick Mathewson Date: Sat Mar 3 11:59:27 2018 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25378 | 4 doc/tor.1.txt| 3 ++- src/common/log.c | 5 - 3

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

2018-03-03 Thread nickm
commit 338dbdab93328e00b5e80934ce0352bebaf9ce25 Merge: 62482ea27 ccf0f77da Author: Nick Mathewson Date: Sat Mar 3 11:59:27 2018 -0500 Merge branch 'maint-0.3.3' changes/bug25378 | 4 doc/tor.1.txt| 3 ++- src/common/log.c | 5 - 3 files changed, 10

[tor-commits] [tor/maint-0.3.3] Update tor.1.txt with the currently available log domains.

2018-03-03 Thread nickm
commit 59a7b00384a6e5fb905b064faed62c5b969ffebd Author: Alexander Færøy Date: Tue Feb 27 22:57:30 2018 +0100 Update tor.1.txt with the currently available log domains. See: https://bugs.torproject.org/25378 --- doc/tor.1.txt| 3 ++- src/common/log.c | 5

[tor-commits] [tor/master] changes file for 25378

2018-03-03 Thread nickm
commit ccf0f77da1894a11502fa36767838f687a4494d9 Author: Nick Mathewson Date: Sat Mar 3 11:58:22 2018 -0500 changes file for 25378 --- changes/bug25378 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug25378 b/changes/bug25378 new file mode 100644

[tor-commits] [torspec/master] Merge branch 'ticket25095_01_squashed'

2018-03-03 Thread nickm
commit 9ebb361fd9b4489165215c7679d54dccfb074860 Merge: d4a64fb ed14d85 Author: Nick Mathewson Date: Sat Mar 3 11:55:29 2018 -0500 Merge branch 'ticket25095_01_squashed' dir-spec.txt | 41 + 1 file changed, 41 insertions(+)

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

2018-03-03 Thread nickm
commit cc7de9ce1d0532d97623a74ed014e39c62a6a840 Merge: aec505a31 30225fd89 Author: Nick Mathewson Date: Sat Mar 3 11:53:01 2018 -0500 Merge branch 'ticket23814' into maint-0.3.3 changes/refactor23814 | 4 + doc/tor.1.txt | 30 ---

[tor-commits] [tor/release-0.3.3] Remove the old ("deterministic") download schedule.

2018-03-03 Thread nickm
commit e0049ef022b8bf9b808a9074820bb2a33f92ac1b Author: Nick Mathewson Date: Thu Jan 25 15:51:13 2018 -0500 Remove the old ("deterministic") download schedule. We haven't meant to use it since we introduced the random exponential schedule. Closes

[tor-commits] [tor/release-0.3.3] fixup! Remove the old ("deterministic") download schedule.

2018-03-03 Thread nickm
commit bf74194f57398fcc19f3123740014ca38ab61ec2 Author: Nick Mathewson Date: Thu Jan 25 15:52:33 2018 -0500 fixup! Remove the old ("deterministic") download schedule. Un-indent a block. I'm doing this as a separate fixup commit to make review

[tor-commits] [torspec/master] tor-spec: Document DoS mitigation consensus param

2018-03-03 Thread nickm
commit ed14d85d57cdcf0742040a57e9f0a75f69567482 Author: David Goulet Date: Tue Feb 13 09:44:07 2018 -0500 tor-spec: Document DoS mitigation consensus param Closes #25095 Signed-off-by: David Goulet --- dir-spec.txt | 41

[tor-commits] [tor/release-0.3.3] Remove two vestigial MaxDownloadTries checks from directory.c

2018-03-03 Thread nickm
commit c0024edd2651761a2740d422a9dceca65c3721cf Author: Nick Mathewson Date: Wed Jan 31 15:08:46 2018 -0500 Remove two vestigial MaxDownloadTries checks from directory.c These are no longer meaningful, since there's no longer an upper limit to how many

[tor-commits] [tor/release-0.3.3] remove the max_failures argument from download_status_is_ready.

2018-03-03 Thread nickm
commit b8ff7407a71fc51193dedb8cf952805c0fb3e774 Author: Nick Mathewson Date: Wed Jan 31 15:03:47 2018 -0500 remove the max_failures argument from download_status_is_ready. --- src/or/bridges.c | 3 +-- src/or/directory.h | 8 ++-- src/or/microdesc.c

[tor-commits] [tor/release-0.3.3] Remove MaxDownloadTries options from the manpage

2018-03-03 Thread nickm
commit 30225fd89a1899cad4f53506773939ca64ead8b0 Author: Nick Mathewson Date: Wed Jan 31 15:14:48 2018 -0500 Remove MaxDownloadTries options from the manpage --- doc/tor.1.txt | 30 -- 1 file changed, 30 deletions(-) diff --git

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

2018-03-03 Thread nickm
commit ac93889ee83f233354a70c004260d3e6c4dcbdcb Merge: 2a20f8e51 cc7de9ce1 Author: Nick Mathewson Date: Sat Mar 3 11:53:05 2018 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 changes/refactor23814 | 4 + doc/tor.1.txt | 30 ---

[tor-commits] [tor/release-0.3.3] Obsolete the now-unused MaxTries options.

2018-03-03 Thread nickm
commit 946ebd8419fc1a2c2a95c1635ff6991119691380 Author: Nick Mathewson Date: Wed Jan 31 15:11:47 2018 -0500 Obsolete the now-unused MaxTries options. --- src/or/config.c | 70 + src/or/or.h | 26

[tor-commits] [tor/release-0.3.3] Remove all the old max_delay logic.

2018-03-03 Thread nickm
commit 5b55e15707fd49079b9c127b339976c4f446e131 Author: Nick Mathewson Date: Thu Jan 25 16:05:20 2018 -0500 Remove all the old max_delay logic. We had tests for it, but it was always INT_MAX. --- src/or/directory.c | 53

[tor-commits] [tor/release-0.3.3] fixup! Remove the old ("deterministic") download schedule.

2018-03-03 Thread nickm
commit cd4fd9887b335e83980b8d41ef223cfb651fdc2a Author: Nick Mathewson Date: Thu Jan 25 16:05:09 2018 -0500 fixup! Remove the old ("deterministic") download schedule. oops, fix the bug number. --- changes/refactor23814 | 2 +- 1 file changed, 1 insertion(+),

[tor-commits] [tor/maint-0.3.3] Remove two vestigial MaxDownloadTries checks from directory.c

2018-03-03 Thread nickm
commit c0024edd2651761a2740d422a9dceca65c3721cf Author: Nick Mathewson Date: Wed Jan 31 15:08:46 2018 -0500 Remove two vestigial MaxDownloadTries checks from directory.c These are no longer meaningful, since there's no longer an upper limit to how many

[tor-commits] [tor/maint-0.3.3] Remove all the old max_delay logic.

2018-03-03 Thread nickm
commit 5b55e15707fd49079b9c127b339976c4f446e131 Author: Nick Mathewson Date: Thu Jan 25 16:05:20 2018 -0500 Remove all the old max_delay logic. We had tests for it, but it was always INT_MAX. --- src/or/directory.c | 53

[tor-commits] [tor/master] fixup! Remove the old ("deterministic") download schedule.

2018-03-03 Thread nickm
commit bf74194f57398fcc19f3123740014ca38ab61ec2 Author: Nick Mathewson Date: Thu Jan 25 15:52:33 2018 -0500 fixup! Remove the old ("deterministic") download schedule. Un-indent a block. I'm doing this as a separate fixup commit to make review

[tor-commits] [tor/maint-0.3.3] fixup! Remove the old ("deterministic") download schedule.

2018-03-03 Thread nickm
commit cd4fd9887b335e83980b8d41ef223cfb651fdc2a Author: Nick Mathewson Date: Thu Jan 25 16:05:09 2018 -0500 fixup! Remove the old ("deterministic") download schedule. oops, fix the bug number. --- changes/refactor23814 | 2 +- 1 file changed, 1 insertion(+),

[tor-commits] [tor/master] remove the max_failures argument from download_status_is_ready.

2018-03-03 Thread nickm
commit b8ff7407a71fc51193dedb8cf952805c0fb3e774 Author: Nick Mathewson Date: Wed Jan 31 15:03:47 2018 -0500 remove the max_failures argument from download_status_is_ready. --- src/or/bridges.c | 3 +-- src/or/directory.h | 8 ++-- src/or/microdesc.c

[tor-commits] [tor/master] Remove two vestigial MaxDownloadTries checks from directory.c

2018-03-03 Thread nickm
commit c0024edd2651761a2740d422a9dceca65c3721cf Author: Nick Mathewson Date: Wed Jan 31 15:08:46 2018 -0500 Remove two vestigial MaxDownloadTries checks from directory.c These are no longer meaningful, since there's no longer an upper limit to how many

[tor-commits] [tor/master] Obsolete the now-unused MaxTries options.

2018-03-03 Thread nickm
commit 946ebd8419fc1a2c2a95c1635ff6991119691380 Author: Nick Mathewson Date: Wed Jan 31 15:11:47 2018 -0500 Obsolete the now-unused MaxTries options. --- src/or/config.c | 70 + src/or/or.h | 26

[tor-commits] [tor/master] Merge branch 'ticket23814' into maint-0.3.3

2018-03-03 Thread nickm
commit cc7de9ce1d0532d97623a74ed014e39c62a6a840 Merge: aec505a31 30225fd89 Author: Nick Mathewson Date: Sat Mar 3 11:53:01 2018 -0500 Merge branch 'ticket23814' into maint-0.3.3 changes/refactor23814 | 4 + doc/tor.1.txt | 30 ---

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

2018-03-03 Thread nickm
commit 62482ea279d51768e5cd510d5e23808333709182 Merge: 27c3a1d65 cc7de9ce1 Author: Nick Mathewson Date: Sat Mar 3 11:53:05 2018 -0500 Merge branch 'maint-0.3.3' changes/refactor23814 | 4 + doc/tor.1.txt | 30 --- src/or/bridges.c |

[tor-commits] [tor/maint-0.3.3] Remove the old ("deterministic") download schedule.

2018-03-03 Thread nickm
commit e0049ef022b8bf9b808a9074820bb2a33f92ac1b Author: Nick Mathewson Date: Thu Jan 25 15:51:13 2018 -0500 Remove the old ("deterministic") download schedule. We haven't meant to use it since we introduced the random exponential schedule. Closes

[tor-commits] [tor/maint-0.3.3] Merge branch 'ticket23814' into maint-0.3.3

2018-03-03 Thread nickm
commit cc7de9ce1d0532d97623a74ed014e39c62a6a840 Merge: aec505a31 30225fd89 Author: Nick Mathewson Date: Sat Mar 3 11:53:01 2018 -0500 Merge branch 'ticket23814' into maint-0.3.3 changes/refactor23814 | 4 + doc/tor.1.txt | 30 ---

[tor-commits] [tor/master] Remove MaxDownloadTries options from the manpage

2018-03-03 Thread nickm
commit 30225fd89a1899cad4f53506773939ca64ead8b0 Author: Nick Mathewson Date: Wed Jan 31 15:14:48 2018 -0500 Remove MaxDownloadTries options from the manpage --- doc/tor.1.txt | 30 -- 1 file changed, 30 deletions(-) diff --git

[tor-commits] [tor/maint-0.3.3] Remove MaxDownloadTries options from the manpage

2018-03-03 Thread nickm
commit 30225fd89a1899cad4f53506773939ca64ead8b0 Author: Nick Mathewson Date: Wed Jan 31 15:14:48 2018 -0500 Remove MaxDownloadTries options from the manpage --- doc/tor.1.txt | 30 -- 1 file changed, 30 deletions(-) diff --git

[tor-commits] [tor/master] Remove all the old max_delay logic.

2018-03-03 Thread nickm
commit 5b55e15707fd49079b9c127b339976c4f446e131 Author: Nick Mathewson Date: Thu Jan 25 16:05:20 2018 -0500 Remove all the old max_delay logic. We had tests for it, but it was always INT_MAX. --- src/or/directory.c | 53

[tor-commits] [tor/maint-0.3.3] Obsolete the now-unused MaxTries options.

2018-03-03 Thread nickm
commit 946ebd8419fc1a2c2a95c1635ff6991119691380 Author: Nick Mathewson Date: Wed Jan 31 15:11:47 2018 -0500 Obsolete the now-unused MaxTries options. --- src/or/config.c | 70 + src/or/or.h | 26

[tor-commits] [tor/maint-0.3.3] remove the max_failures argument from download_status_is_ready.

2018-03-03 Thread nickm
commit b8ff7407a71fc51193dedb8cf952805c0fb3e774 Author: Nick Mathewson Date: Wed Jan 31 15:03:47 2018 -0500 remove the max_failures argument from download_status_is_ready. --- src/or/bridges.c | 3 +-- src/or/directory.h | 8 ++-- src/or/microdesc.c

[tor-commits] [tor/master] fixup! Remove the old ("deterministic") download schedule.

2018-03-03 Thread nickm
commit cd4fd9887b335e83980b8d41ef223cfb651fdc2a Author: Nick Mathewson Date: Thu Jan 25 16:05:09 2018 -0500 fixup! Remove the old ("deterministic") download schedule. oops, fix the bug number. --- changes/refactor23814 | 2 +- 1 file changed, 1 insertion(+),

[tor-commits] [tor/maint-0.3.3] fixup! Remove the old ("deterministic") download schedule.

2018-03-03 Thread nickm
commit bf74194f57398fcc19f3123740014ca38ab61ec2 Author: Nick Mathewson Date: Thu Jan 25 15:52:33 2018 -0500 fixup! Remove the old ("deterministic") download schedule. Un-indent a block. I'm doing this as a separate fixup commit to make review

[tor-commits] [tor/master] Remove the old ("deterministic") download schedule.

2018-03-03 Thread nickm
commit e0049ef022b8bf9b808a9074820bb2a33f92ac1b Author: Nick Mathewson Date: Thu Jan 25 15:51:13 2018 -0500 Remove the old ("deterministic") download schedule. We haven't meant to use it since we introduced the random exponential schedule. Closes

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

2018-03-03 Thread nickm
commit 2a20f8e51a71b5e3ee25d8d2e7908be39e72ba8e Merge: d15a7a27b aec505a31 Author: Nick Mathewson Date: Sat Mar 3 11:34:10 2018 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2018-03-03 Thread nickm
commit 2e2aacca2aa635a840c57e87e3769403505a19d2 Merge: c527a8a9c 9eb6f9d3c Author: Nick Mathewson Date: Sat Mar 3 11:32:29 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

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

2018-03-03 Thread nickm
commit 2d42648eaf0bfbf66957a427ff503d5d47d03bc5 Merge: 31cc63deb 0026d1a67 Author: Nick Mathewson Date: Sat Mar 3 11:34:10 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/release-0.3.3] bump version to 0.3.2.10-dev

2018-03-03 Thread nickm
commit 0026d1a673e8b01057b0735c977a55995812c85e Author: Nick Mathewson Date: Sat Mar 3 11:33:27 2018 -0500 bump version to 0.3.2.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-03-03 Thread nickm
commit d81a5231eee22d2d73a54b87b9ee13d3896220bc Merge: 1ec386561 0aa794d30 Author: Nick Mathewson Date: Sat Mar 3 11:33:02 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump

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

2018-03-03 Thread nickm
commit d81a5231eee22d2d73a54b87b9ee13d3896220bc Merge: 1ec386561 0aa794d30 Author: Nick Mathewson Date: Sat Mar 3 11:33:02 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-03-03 Thread nickm
commit 2e2aacca2aa635a840c57e87e3769403505a19d2 Merge: c527a8a9c 9eb6f9d3c Author: Nick Mathewson Date: Sat Mar 3 11:32:29 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

[tor-commits] [tor/release-0.3.2] version bump to 0.3.1.10-dev

2018-03-03 Thread nickm
commit 0aa794d30926b0d829fc8201ed3005f6a304705a Author: Nick Mathewson Date: Sat Mar 3 11:32:51 2018 -0500 version bump to 0.3.1.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

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

2018-03-03 Thread nickm
commit 2e2aacca2aa635a840c57e87e3769403505a19d2 Merge: c527a8a9c 9eb6f9d3c Author: Nick Mathewson Date: Sat Mar 3 11:32:29 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

[tor-commits] [tor/release-0.3.2] Bump version to 0.2.9.15-dev

2018-03-03 Thread nickm
commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

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

2018-03-03 Thread nickm
commit 27c3a1d65740bd1fe85d7fb0cd401708dcf3a457 Merge: 9a14f1ef6 aec505a31 Author: Nick Mathewson Date: Sat Mar 3 11:34:02 2018 -0500 Merge branch 'maint-0.3.3' "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/release-0.3.2] bump version to 0.3.2.10-dev

2018-03-03 Thread nickm
commit 0026d1a673e8b01057b0735c977a55995812c85e Author: Nick Mathewson Date: Sat Mar 3 11:33:27 2018 -0500 bump version to 0.3.2.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-03-03 Thread nickm
commit 35d945a646b3384640d3863aec07d873179efffd Merge: 15f6201a5 0026d1a67 Author: Nick Mathewson Date: Sat Mar 3 11:33:33 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" merge to avoid version bump.

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

2018-03-03 Thread nickm
commit 2e2aacca2aa635a840c57e87e3769403505a19d2 Merge: c527a8a9c 9eb6f9d3c Author: Nick Mathewson Date: Sat Mar 3 11:32:29 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

[tor-commits] [tor/master] Bump version to 0.2.9.15-dev

2018-03-03 Thread nickm
commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/master] bump version to 0.3.2.10-dev

2018-03-03 Thread nickm
commit 0026d1a673e8b01057b0735c977a55995812c85e Author: Nick Mathewson Date: Sat Mar 3 11:33:27 2018 -0500 bump version to 0.3.2.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-03-03 Thread nickm
commit d81a5231eee22d2d73a54b87b9ee13d3896220bc Merge: 1ec386561 0aa794d30 Author: Nick Mathewson Date: Sat Mar 3 11:33:02 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump

[tor-commits] [tor/master] version bump to 0.3.1.10-dev

2018-03-03 Thread nickm
commit 0aa794d30926b0d829fc8201ed3005f6a304705a Author: Nick Mathewson Date: Sat Mar 3 11:32:51 2018 -0500 version bump to 0.3.1.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/release-0.2.9] Bump version to 0.2.9.15-dev

2018-03-03 Thread nickm
commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.3] version bump to 0.3.1.10-dev

2018-03-03 Thread nickm
commit 0aa794d30926b0d829fc8201ed3005f6a304705a Author: Nick Mathewson Date: Sat Mar 3 11:32:51 2018 -0500 version bump to 0.3.1.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/release-0.3.3] version bump to 0.3.1.10-dev

2018-03-03 Thread nickm
commit 0aa794d30926b0d829fc8201ed3005f6a304705a Author: Nick Mathewson Date: Sat Mar 3 11:32:51 2018 -0500 version bump to 0.3.1.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

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

2018-03-03 Thread nickm
commit 35d945a646b3384640d3863aec07d873179efffd Merge: 15f6201a5 0026d1a67 Author: Nick Mathewson Date: Sat Mar 3 11:33:33 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" merge to avoid version bump.

[tor-commits] [tor/release-0.3.1] Bump version to 0.2.9.15-dev

2018-03-03 Thread nickm
commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/release-0.3.3] bump to 0.3.3.3-alpha-dev

2018-03-03 Thread nickm
commit aec505a310601149d7ad3e8ae61b4f988ed8e8ed Author: Nick Mathewson Date: Sat Mar 3 11:33:56 2018 -0500 bump to 0.3.3.3-alpha-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +-

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-03-03 Thread nickm
commit d81a5231eee22d2d73a54b87b9ee13d3896220bc Merge: 1ec386561 0aa794d30 Author: Nick Mathewson Date: Sat Mar 3 11:33:02 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump

[tor-commits] [tor/maint-0.3.3] bump version to 0.3.2.10-dev

2018-03-03 Thread nickm
commit 0026d1a673e8b01057b0735c977a55995812c85e Author: Nick Mathewson Date: Sat Mar 3 11:33:27 2018 -0500 bump version to 0.3.2.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/release-0.3.3] Bump version to 0.2.9.15-dev

2018-03-03 Thread nickm
commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.2] bump version to 0.3.2.10-dev

2018-03-03 Thread nickm
commit 0026d1a673e8b01057b0735c977a55995812c85e Author: Nick Mathewson Date: Sat Mar 3 11:33:27 2018 -0500 bump version to 0.3.2.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

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

2018-03-03 Thread nickm
commit 2e2aacca2aa635a840c57e87e3769403505a19d2 Merge: c527a8a9c 9eb6f9d3c Author: Nick Mathewson Date: Sat Mar 3 11:32:29 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

[tor-commits] [tor/maint-0.3.1] Bump version to 0.2.9.15-dev

2018-03-03 Thread nickm
commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-03-03 Thread nickm
commit d81a5231eee22d2d73a54b87b9ee13d3896220bc Merge: 1ec386561 0aa794d30 Author: Nick Mathewson Date: Sat Mar 3 11:33:02 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump

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

2018-03-03 Thread nickm
commit 1eb7041ef105af931d1eb3984aeddb2e79aa03a1 Merge: e3966d47c 0aa794d30 Author: Nick Mathewson Date: Sat Mar 3 11:34:10 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-03-03 Thread nickm
commit 35d945a646b3384640d3863aec07d873179efffd Merge: 15f6201a5 0026d1a67 Author: Nick Mathewson Date: Sat Mar 3 11:33:33 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" merge to avoid version bump.

[tor-commits] [tor/master] bump to 0.3.3.3-alpha-dev

2018-03-03 Thread nickm
commit aec505a310601149d7ad3e8ae61b4f988ed8e8ed Author: Nick Mathewson Date: Sat Mar 3 11:33:56 2018 -0500 bump to 0.3.3.3-alpha-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +-

[tor-commits] [tor/release-0.3.1] version bump to 0.3.1.10-dev

2018-03-03 Thread nickm
commit 0aa794d30926b0d829fc8201ed3005f6a304705a Author: Nick Mathewson Date: Sat Mar 3 11:32:51 2018 -0500 version bump to 0.3.1.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.3] bump to 0.3.3.3-alpha-dev

2018-03-03 Thread nickm
commit aec505a310601149d7ad3e8ae61b4f988ed8e8ed Author: Nick Mathewson Date: Sat Mar 3 11:33:56 2018 -0500 bump to 0.3.3.3-alpha-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +-

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

2018-03-03 Thread nickm
commit 4a27e6e2352a71881712952b6ba2c6683210ee96 Merge: 74b1ed684 9eb6f9d3c Author: Nick Mathewson Date: Sat Mar 3 11:34:10 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-03-03 Thread nickm
commit 2e2aacca2aa635a840c57e87e3769403505a19d2 Merge: c527a8a9c 9eb6f9d3c Author: Nick Mathewson Date: Sat Mar 3 11:32:29 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

[tor-commits] [tor/maint-0.3.3] Bump version to 0.2.9.15-dev

2018-03-03 Thread nickm
commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.2] Bump version to 0.2.9.15-dev

2018-03-03 Thread nickm
commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.2] version bump to 0.3.1.10-dev

2018-03-03 Thread nickm
commit 0aa794d30926b0d829fc8201ed3005f6a304705a Author: Nick Mathewson Date: Sat Mar 3 11:32:51 2018 -0500 version bump to 0.3.1.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-03-03 Thread nickm
commit 2e2aacca2aa635a840c57e87e3769403505a19d2 Merge: c527a8a9c 9eb6f9d3c Author: Nick Mathewson Date: Sat Mar 3 11:32:29 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

[tor-commits] [tor/maint-0.2.9] Bump version to 0.2.9.15-dev

2018-03-03 Thread nickm
commit 9eb6f9d3c805c1f49b7ac00776368e672829cf95 Author: Nick Mathewson Date: Sat Mar 3 11:32:16 2018 -0500 Bump version to 0.2.9.15-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.1] version bump to 0.3.1.10-dev

2018-03-03 Thread nickm
commit 0aa794d30926b0d829fc8201ed3005f6a304705a Author: Nick Mathewson Date: Sat Mar 3 11:32:51 2018 -0500 version bump to 0.3.1.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [webwml/master] Increment tor versions

2018-03-03 Thread nickm
commit c3d49ee3cc8eb30b3e4001f7c591349b7a2270b5 Author: Nick Mathewson Date: Sat Mar 3 08:26:37 2018 -0500 Increment tor versions --- Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile

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

2018-03-03 Thread nickm
commit 10206b25d390720d0a5a5904ee6cbc3cc5552af2 Merge: 1bc35c59f 15f6201a5 Author: Nick Mathewson Date: Thu Mar 1 16:44:31 2018 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/release-0.3.3] Draft changelog for 0.3.3.3-alpha

2018-03-03 Thread nickm
commit 1bc35c59fbea02bc030e5f855fc65fb05475c0f9 Author: Nick Mathewson Date: Thu Mar 1 16:41:56 2018 -0500 Draft changelog for 0.3.3.3-alpha --- ChangeLog| 35 +-- changes/bug25249 | 3 --- changes/bug25249.2

[tor-commits] [tor/release-0.3.3] Add a changelog entry for 25250.

2018-03-03 Thread nickm
commit 5c6b706c6168d874c131a5e142eefeac7fbc4163 Author: Nick Mathewson Date: Thu Mar 1 16:52:44 2018 -0500 Add a changelog entry for 25250. --- ChangeLog | 5 + 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1b7d29319..b2fb95fc8 100644

[tor-commits] [tor/release-0.3.3] increment to 0.3.3.3-alpha

2018-03-03 Thread nickm
commit 15f6201a5b7249451608653040241b8f33a16db0 Author: Nick Mathewson Date: Thu Mar 1 16:44:07 2018 -0500 increment to 0.3.3.3-alpha --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-03-03 Thread nickm
commit d01abb9346bcb7b240b5277551ea75e85dfc160c Merge: bcfb03495 d4a758e08 Author: Nick Mathewson Date: Thu Mar 1 16:07:59 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug25249 | 3 + changes/bug25249.2 | 3 +

[tor-commits] [tor/release-0.3.3] Add more of Teor's protover tests.

2018-03-03 Thread nickm
commit 0953c43c955c4bdb82f0aa86f23f9c0cdcc2c9a1 Author: Nick Mathewson Date: Wed Feb 14 11:56:03 2018 -0500 Add more of Teor's protover tests. These are as Teor wrote them; I've disabled the ones that don't pass yet, with comments. ---

[tor-commits] [tor/release-0.3.3] Update to 0.3.1.10

2018-03-03 Thread nickm
commit c527a8a9c969d446ea0d7f6f4110d5082187dce2 Author: Nick Mathewson Date: Thu Mar 1 16:43:01 2018 -0500 Update to 0.3.1.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

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

2018-03-03 Thread nickm
commit d4a758e08373854639af6991ec95836fa7c15ca4 Merge: ac1942ac5 c1bb8836f Author: Nick Mathewson Date: Thu Mar 1 16:07:59 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug25249 | 3 + changes/bug25249.2 | 3 +

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-03-03 Thread nickm
commit 5b0ae084008eac13d051026c013862b239212807 Merge: d01abb934 c527a8a9c Author: Nick Mathewson Date: Thu Mar 1 16:43:10 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" to avoid version bump. ___

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

2018-03-03 Thread nickm
commit f7eff2f8c53dacb7c375bbe6bc9cced95103307d Merge: d489e4847 d01abb934 Author: Nick Mathewson Date: Thu Mar 1 16:10:43 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25249 | 3 + changes/bug25249.2 | 3 +

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

2018-03-03 Thread nickm
commit 805a785780c2f3abccf080caddc345ca8f484797 Merge: d4a758e08 35753c077 Author: Nick Mathewson Date: Thu Mar 1 16:42:25 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

  1   2   3   >