February 2017 - tor-commits - lists.torproject.org

[metrics-lib/release] Deprecate three classes using HttpURLConnection.
by karsten＠torproject.org 17 Feb '17

17 Feb '17

commit 05020464627e379c8de86c80d466f814bd6fe20a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 14 10:48:28 2017 +0100 Deprecate three classes using HttpURLConnection. Fixes #20323. --- CHANGELOG.md | 6 ++++++ src/main/java/org/torproject/descriptor/DescriptorDownloader.java | 3 +++ src/main/java/org/torproject/descriptor/DescriptorRequest.java | 4 ++++ .../org/torproject/descriptor/impl/DescriptorCollectorImpl.java | 8 ++++++++ 4 files changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a760143..b79df01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 1.6.0 - 2016-??-?? + * Major changes + - Deprecate DescriptorDownloader in favor of the much more widely + used DescriptorCollector. + * Medium changes - Add two methods for loading and saving a parse history file in the descriptor reader to avoid situations where applications fail @@ -17,6 +21,8 @@ entries, and "(recommended|required)-(client|relay)-protocols" lines in consensuses and votes. - Parse "shared-rand-.*" lines in consensuses and votes. + - Deprecate DescriptorCollectorImpl now that + DescriptorIndexCollector is the default. # Changes in version 1.5.0 - 2016-10-19 diff --git a/src/main/java/org/torproject/descriptor/DescriptorDownloader.java b/src/main/java/org/torproject/descriptor/DescriptorDownloader.java index f3335f4..52b25bf 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorDownloader.java +++ b/src/main/java/org/torproject/descriptor/DescriptorDownloader.java @@ -14,6 +14,9 @@ import java.util.Set; * setting any configuration options and initiating the download * process.</p> * + * @deprecated Removed as descriptor source in favor of the much more widely + * used {@link DescriptorCollector}. + * * @since 1.0.0 */ public interface DescriptorDownloader { diff --git a/src/main/java/org/torproject/descriptor/DescriptorRequest.java b/src/main/java/org/torproject/descriptor/DescriptorRequest.java index 0927339..9009ca8 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorRequest.java +++ b/src/main/java/org/torproject/descriptor/DescriptorRequest.java @@ -15,6 +15,10 @@ import java.util.List; * {@link Descriptor} interface. This container also stores potentially * useful meta-data about the descriptor request.</p> * + * @deprecated Removed as descriptor container together with + * {@link DescriptorDownloader} in favor of the much more widely used + * {@link DescriptorCollector}. + * * @since 1.0.0 */ public interface DescriptorRequest { diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java index c3c0fac..214227f 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java @@ -32,6 +32,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; +/** + * Download files from a CollecTor instance based on the remote instance's + * directory listings. + * + * @deprecated Replaced by {@link DescriptorIndexCollector} which uses the + * remote instance's index.json file as a more robust alternative to parsing + * the remote instance's directory listings. + */ public class DescriptorCollectorImpl implements DescriptorCollector { private static Logger log = LoggerFactory

1 0

[metrics-lib/release] Prepare for 1.6.0 release.
by karsten＠torproject.org 17 Feb '17

17 Feb '17

commit 10042d3ce2c157303007361cb0057b2f3527d8bd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 17 09:29:37 2017 +0100 Prepare for 1.6.0 release. --- CERT | 20 ++++++++++---------- CHANGELOG.md | 2 +- build.xml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CERT b/CERT index ebe19a7..6cc5a93 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIEc2oU6DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIEYQnM/zANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU -b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTYw -ODMxMDgzMTIyWhcNMTYxMTI5MDgzMTIyWjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcw +MTAyMTYzNTQ2WhcNMTcwNDAyMTYzNTQ2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAUFNO -VyxE1ej/+5Q91tm8wCcFZYJRSVhQ6lqVs7kfNd6ggCUno8e8xnV3+nhNpT6vjc6g -gGlOQKRPR2sNw2aDoXWtPa7h1DUtD4GeWU16kg9YTBNw9+Yay9jWQUKOs3hd86T5 -8xsndvmWuYf/jyW/B+k5f9u7ZQ3LWM2fwXYFiZmd+i7rDJJV8YEECkHRJMaZKB+B -0CJ3Jfv57qsgqmvskqP+FmwmQz91mNn0iAUtpZoojqhzRhjr0/5VoqmbxeVeBhdI -3YRZW/FkC/1hbu1CgrtRXoDu+fChyrvpLjqgTuCaBYmfjVOajq0F9GmhNkuMtZgw -nLPNRMoyiTx/z4VFpg== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAi2K5 +o3UnRBLdk9zkBEDbqPWxq8eiiIacbSoorspVlv4vqNO2UsTLc2sA4zZpY1L7Mkc6 +y7pcd1jFc6e9Wzt0agoIU9i3pyqkUx11ktE8a8CiVjDOns05GHe1DsLYcSLG8aJR +2pNEFjZEndHTXGRKwxtTmHimsIIWiy8tYFkC7SkBQj+BnXBqzCbJPhRDpMdhyJmQ +CLUhTTgU30G32x3vOhddWHAH8UDsXNlBASQOFs+A/1Mx5DI5AXLtwjp/rweTWoBk +11SfkVS/mfMZNRGOA9DEfoRYHPT0Rn4URAQrBr73CKQaVVYyeuDOoEs69KRH2JSO +IRcgAfpjtg8cry/eiw== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index b79df01..7b85361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.6.0 - 2016-??-?? +# Changes in version 1.6.0 - 2017-02-17 * Major changes - Deprecate DescriptorDownloader in favor of the much more widely diff --git a/build.xml b/build.xml index cc7a4a7..1522f12 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="descriptor" basedir="."> - <property name="release.version" value="1.5.0-dev" /> + <property name="release.version" value="1.6.0" /> <property name="javadoc-title" value="DescripTor API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/**" /> <property name="implementation-title" value="DescripTor" />

1 0

[metrics-lib/master] Tweak Javadocs.
by karsten＠torproject.org 17 Feb '17

17 Feb '17

commit 880c6036a3490dae1318c94d715998a1ce3b75be Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 17 16:20:10 2017 +0100 Tweak Javadocs. --- src/main/java/org/torproject/descriptor/DescriptorReader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/DescriptorReader.java b/src/main/java/org/torproject/descriptor/DescriptorReader.java index 2a4f1c3..32c26d1 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorReader.java +++ b/src/main/java/org/torproject/descriptor/DescriptorReader.java @@ -68,9 +68,9 @@ public interface DescriptorReader { * <p>Lines in the history file contain the last modified time in * milliseconds since the epoch and the absolute path of a file.</p> * - * @deprecated Replaced by {@link #setHistoryFile()} and - * {@link #saveHistoryFile()} which let the application explicitly tell us - * when it's done processing read descriptors. + * @deprecated Replaced by {@link #setHistoryFile(File)} and + * {@link #saveHistoryFile(File)} which let the application explicitly + * tell us when it's done processing read descriptors. * * @since 1.0.0 */

1 0

[metrics-lib/master] Prepare for 1.6.0 release.
by karsten＠torproject.org 17 Feb '17

17 Feb '17

commit 10042d3ce2c157303007361cb0057b2f3527d8bd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 17 09:29:37 2017 +0100 Prepare for 1.6.0 release. --- CERT | 20 ++++++++++---------- CHANGELOG.md | 2 +- build.xml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CERT b/CERT index ebe19a7..6cc5a93 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIEc2oU6DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIEYQnM/zANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU -b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTYw -ODMxMDgzMTIyWhcNMTYxMTI5MDgzMTIyWjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcw +MTAyMTYzNTQ2WhcNMTcwNDAyMTYzNTQ2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAUFNO -VyxE1ej/+5Q91tm8wCcFZYJRSVhQ6lqVs7kfNd6ggCUno8e8xnV3+nhNpT6vjc6g -gGlOQKRPR2sNw2aDoXWtPa7h1DUtD4GeWU16kg9YTBNw9+Yay9jWQUKOs3hd86T5 -8xsndvmWuYf/jyW/B+k5f9u7ZQ3LWM2fwXYFiZmd+i7rDJJV8YEECkHRJMaZKB+B -0CJ3Jfv57qsgqmvskqP+FmwmQz91mNn0iAUtpZoojqhzRhjr0/5VoqmbxeVeBhdI -3YRZW/FkC/1hbu1CgrtRXoDu+fChyrvpLjqgTuCaBYmfjVOajq0F9GmhNkuMtZgw -nLPNRMoyiTx/z4VFpg== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAi2K5 +o3UnRBLdk9zkBEDbqPWxq8eiiIacbSoorspVlv4vqNO2UsTLc2sA4zZpY1L7Mkc6 +y7pcd1jFc6e9Wzt0agoIU9i3pyqkUx11ktE8a8CiVjDOns05GHe1DsLYcSLG8aJR +2pNEFjZEndHTXGRKwxtTmHimsIIWiy8tYFkC7SkBQj+BnXBqzCbJPhRDpMdhyJmQ +CLUhTTgU30G32x3vOhddWHAH8UDsXNlBASQOFs+A/1Mx5DI5AXLtwjp/rweTWoBk +11SfkVS/mfMZNRGOA9DEfoRYHPT0Rn4URAQrBr73CKQaVVYyeuDOoEs69KRH2JSO +IRcgAfpjtg8cry/eiw== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index b79df01..7b85361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.6.0 - 2016-??-?? +# Changes in version 1.6.0 - 2017-02-17 * Major changes - Deprecate DescriptorDownloader in favor of the much more widely diff --git a/build.xml b/build.xml index cc7a4a7..1522f12 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="descriptor" basedir="."> - <property name="release.version" value="1.5.0-dev" /> + <property name="release.version" value="1.6.0" /> <property name="javadoc-title" value="DescripTor API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/**" /> <property name="implementation-title" value="DescripTor" />

1 0

[tor/master] Fix memleak in test_getinfo_helper_onion.
by nickm＠torproject.org 17 Feb '17

17 Feb '17

commit d3f0f10efd46ba7bdbd81e15de03e43ec3d6283b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 10:07:52 2017 -0500 Fix memleak in test_getinfo_helper_onion. Fix on fc58c37e334fec71a20. Not in any released tor --- src/test/test_controller.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_controller.c b/src/test/test_controller.c index fc63d83..206315e 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -144,6 +144,7 @@ test_getinfo_helper_onion(void *arg) done: tor_free(answer); tor_free(service_id); + smartlist_free(dummy.ephemeral_onion_services); } static void

1 0

[tor-browser-build/master] Add a testbuild target
by boklm＠torproject.org 17 Feb '17

17 Feb '17

commit 52ad50f034e007a72936be8775ad111bc968a42d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 17 15:27:47 2017 +0100 Add a testbuild target --- .gitignore | 1 + Makefile | 15 +++++++++++++++ README | 6 ++++++ projects/release/config | 6 ++++++ projects/tor-browser/build | 10 +++++++--- rbm.conf | 11 +++++++++++ rbm.local.conf.example | 15 +++++++++++++++ 7 files changed, 61 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e38b069..9b6754f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ alpha alpha_nightly nightly hardened +testbuild rbm.local.conf logs diff --git a/Makefile b/Makefile index ca46c9e..9481537 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,21 @@ alpha_nightly-windows-i686: submodule-update alpha_nightly-osx-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-osx-x86_64 +testbuild: submodule-update + $(rbm) build release --target testbuild --target torbrowser-all + +testbuild-linux-x86_64: submodule-update + $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 + +testbuild-linux-i686: submodule-update + $(rbm) build release --target testbuild --target torbrowser-linux-i686 + +testbuild-windows-i686: submodule-update + $(rbm) build release --target testbuild --target torbrowser-windows-i686 + +testbuild-osx-x86_64: submodule-update + $(rbm) build release --target testbuild --target torbrowser-osx-x86_64 + hardened-linux-x86_64: submodule-update $(rbm) build release --target hardened --target torbrowser-linux-x86_64 diff --git a/README b/README index e3672ec..a14fb42 100644 --- a/README +++ b/README @@ -70,6 +70,12 @@ name to the makefile target: $ make nightly-windows-i686 $ make nightly-osx-x86_64 +When you want to quickly do a build to test a change, you can use the +testbuild makefile target, and find the build in the testbuild directory. +The build will be the same as regular alpha builds, except that in order +to make the build faster, only the en-US locale will be built, and no +mar file will be created. + Updating git sources -------------------- diff --git a/projects/release/config b/projects/release/config index febe801..e2b2eb9 100644 --- a/projects/release/config +++ b/projects/release/config @@ -54,6 +54,12 @@ targets: var: build_target: alpha + testbuild: + output_dir: 'testbuild' + version: '.' + var: + build_target: torbrowser-testbuild + hardened_nightly: output_dir: 'hardened_nightly' version: '[% c("var/today") %]' diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 3763b21..f952a95 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -240,9 +240,13 @@ python $MARTOOLS/createprecomplete.py popd cd $distdir -# Create full MAR file and compressed package. -MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar -MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR" + +[% IF c("var/build_mar") -%] + # Create full MAR file and compressed package. + MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR" +[% END -%] + [% IF c("var/linux") %] [% c('tar', { tar_src => [ '$PKG_DIR' ], diff --git a/rbm.conf b/rbm.conf index 5faf4cb..5a29308 100644 --- a/rbm.conf +++ b/rbm.conf @@ -10,6 +10,7 @@ var: torbrowser_version: '6.5n' project_name: tor-browser multi_lingual: 0 + build_mar: 1 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed # in the same order. In the cases where the installation order is @@ -63,6 +64,16 @@ targets: var: multi_lingual: 1 + torbrowser-testbuild: + - testbuild + - alpha + testbuild: + var: + # To make build faster, don't build any locale + locales: [] + # Don't create mar files to save time + build_mar: 0 + torbrowser-linux-x86_64: - linux-x86_64 - linux diff --git a/rbm.local.conf.example b/rbm.local.conf.example index ac54935..2a86647 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -39,4 +39,19 @@ var: ### file. #sign_build_gpg_opts: '--local-user XXXXXXXX' +targets: + + ### testbuild is based on alpha by default. Uncomment this if you want it + ### to be based on nightly. + #torbrowser-testbuild: + # - testbuild + # - nightly + + testbuild: + var: + testbuild: 1 + + ### Uncomment this if you want to create mar files in your test build. + #build_mar: 1 + # vim: filetype=yaml sw=2

1 0

[metrics-lib/master] Deprecate three classes using HttpURLConnection.
by karsten＠torproject.org 17 Feb '17

17 Feb '17

commit 05020464627e379c8de86c80d466f814bd6fe20a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 14 10:48:28 2017 +0100 Deprecate three classes using HttpURLConnection. Fixes #20323. --- CHANGELOG.md | 6 ++++++ src/main/java/org/torproject/descriptor/DescriptorDownloader.java | 3 +++ src/main/java/org/torproject/descriptor/DescriptorRequest.java | 4 ++++ .../org/torproject/descriptor/impl/DescriptorCollectorImpl.java | 8 ++++++++ 4 files changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a760143..b79df01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 1.6.0 - 2016-??-?? + * Major changes + - Deprecate DescriptorDownloader in favor of the much more widely + used DescriptorCollector. + * Medium changes - Add two methods for loading and saving a parse history file in the descriptor reader to avoid situations where applications fail @@ -17,6 +21,8 @@ entries, and "(recommended|required)-(client|relay)-protocols" lines in consensuses and votes. - Parse "shared-rand-.*" lines in consensuses and votes. + - Deprecate DescriptorCollectorImpl now that + DescriptorIndexCollector is the default. # Changes in version 1.5.0 - 2016-10-19 diff --git a/src/main/java/org/torproject/descriptor/DescriptorDownloader.java b/src/main/java/org/torproject/descriptor/DescriptorDownloader.java index f3335f4..52b25bf 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorDownloader.java +++ b/src/main/java/org/torproject/descriptor/DescriptorDownloader.java @@ -14,6 +14,9 @@ import java.util.Set; * setting any configuration options and initiating the download * process.</p> * + * @deprecated Removed as descriptor source in favor of the much more widely + * used {@link DescriptorCollector}. + * * @since 1.0.0 */ public interface DescriptorDownloader { diff --git a/src/main/java/org/torproject/descriptor/DescriptorRequest.java b/src/main/java/org/torproject/descriptor/DescriptorRequest.java index 0927339..9009ca8 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorRequest.java +++ b/src/main/java/org/torproject/descriptor/DescriptorRequest.java @@ -15,6 +15,10 @@ import java.util.List; * {@link Descriptor} interface. This container also stores potentially * useful meta-data about the descriptor request.</p> * + * @deprecated Removed as descriptor container together with + * {@link DescriptorDownloader} in favor of the much more widely used + * {@link DescriptorCollector}. + * * @since 1.0.0 */ public interface DescriptorRequest { diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java index c3c0fac..214227f 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java @@ -32,6 +32,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; +/** + * Download files from a CollecTor instance based on the remote instance's + * directory listings. + * + * @deprecated Replaced by {@link DescriptorIndexCollector} which uses the + * remote instance's index.json file as a more robust alternative to parsing + * the remote instance's directory listings. + */ public class DescriptorCollectorImpl implements DescriptorCollector { private static Logger log = LoggerFactory

1 0

[webwml/master] link to the bylaws from the financial docs page
by arma＠torproject.org 17 Feb '17

17 Feb '17

commit 4fa98b7bbc7ce7bb377e4b9ce424f0ff62f46a97 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Feb 17 00:52:39 2017 -0500 link to the bylaws from the financial docs page --- about/en/financials.wml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/about/en/financials.wml b/about/en/financials.wml index 31e4eb0..76e0069 100644 --- a/about/en/financials.wml +++ b/about/en/financials.wml @@ -13,6 +13,13 @@ <div id="maincol"> <h1>Tor: Financial Reports</h1> <dl> + <dt>Fiscal Year 2016</dt> + <dd><a href="findoc/2016-TorProject-Bylaws.pdf">2016-12-05 Tor Project Bylaws</a></dd> + <dd>2016 IRS Form 990 and other forms expected like usual in late 2017</dd> + + <dt>Fiscal Year 2015</dt> + <dd><i>2015 IRS Form 990, State of MA Form PC, and Independent Audit Results</i> coming soon — sorry for the delay.</dd> + <dt>Fiscal Year 2014</dt> <dd><a href="findoc/2014-TorProject-combined-Form990_PC_Audit_Results.pdf">2014 IRS Form 990, State of MA Form PC, and Independent Audit Results</a></dd> <dt>Fiscal Year 2013</dt>

1 0

[webwml/master] add 2016 version of our bylaws
by arma＠torproject.org 16 Feb '17

16 Feb '17

commit 4cb679b534b8b0eed3fc1f5f32f7ac405fbea658 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 16 16:46:30 2017 -0500 add 2016 version of our bylaws --- about/findoc/2016-TorProject-Bylaws.pdf | Bin 0 -> 117196 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/about/findoc/2016-TorProject-Bylaws.pdf b/about/findoc/2016-TorProject-Bylaws.pdf new file mode 100644 index 0000000..91234b4 Binary files /dev/null and b/about/findoc/2016-TorProject-Bylaws.pdf differ

1 0

[tor-browser-build/master] Add Windows Expert Bundle
by boklm＠torproject.org 16 Feb '17

16 Feb '17

commit 3f018465411dc2ad20f6087f1fdc863d116f1578 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 16 22:33:07 2017 +0100 Add Windows Expert Bundle --- projects/release/config | 8 ++++++++ projects/tor/build | 22 +++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/projects/release/config b/projects/release/config index 0b3727f..febe801 100644 --- a/projects/release/config +++ b/projects/release/config @@ -103,6 +103,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-osx-x86_64 + - name: windows-expert-bundle + project: tor + enable: '[% c("var/torbrowser-windows-i686") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-windows-i686 + - expert-bundle build: | #!/bin/sh @@ -112,6 +119,7 @@ build: | mkdir -p "$destdir" [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ + mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ [% END -%] [% IF c("var/torbrowser-osx-x86_64") -%] mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ diff --git a/projects/tor/build b/projects/tor/build index 1f42add..f0b57f1 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -108,15 +108,23 @@ done mkdir -p [% dest_dir _ '/' _ c('filename') %] [% - IF c("var/osx"); - SET tarsrcdir = [ 'Contents' ]; + IF c("var/expert_bundle"); + c('zip', { + zip_src => [ 'Data', 'Tor', ], + zip_args => dest_dir _ '/' _ c('filename') _ '/tor-win32-' _ c("version") _ '.zip', + }); ELSE; - SET tarsrcdir = [ 'Data', 'Tor', ]; + IF c("var/osx"); + SET tarsrcdir = [ 'Contents' ]; + ELSE; + SET tarsrcdir = [ 'Data', 'Tor', ]; + END; + c('tar', { + tar_src => tarsrcdir, + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor.tar.gz', + }); END; - c('tar', { - tar_src => tarsrcdir, - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor.tar.gz', - }) %] +%] [% IF c("var/linux") %] [% c('tar', {

1 0