tor-commits May 2015

tor-commits@lists.torproject.org

22 participants
990 discussions

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 20 May '15

20 May '15

commit f960dae968f5dcd6c24ab8a101619191714329ed Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 20 07:16:21 2015 +0000 Update translations for torbutton-abouttorproperties --- ro/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ro/abouttor.properties b/ro/abouttor.properties index d607324..6298f82 100644 --- a/ro/abouttor.properties +++ b/ro/abouttor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Căutați <a href="%1$S">sigur</a> cu <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Căutați <a href="%1$S">sigur</a> cu <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=Căutați <a href="%1$S">sigur</a> cu <a href="%2$S">Disconnect.me</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above.

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 20 May '15

20 May '15

commit 4b61e0d9d86aa8957225c41f3f8689f2789c61c6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 20 07:16:13 2015 +0000 Update translations for tor_animation --- ro.srt | 76 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/ro.srt b/ro.srt index 78c998d..d87bd17 100644 --- a/ro.srt +++ b/ro.srt @@ -1,23 +1,23 @@ 1 00:00:00,660 --> 00:00:02,780 -We've gotten very used to the Internet. +Am devenit foarte utilizați pe internet. 2 00:00:03,120 --> 00:00:07,700 -We are constantly sharing information -about ourselves and our private lives: +Partajăm constant informații +despre noi și viețile noastre private: 3 00:00:08,000 --> 00:00:09,960 -food we eat, people we meet, +ne hrănim și întâlnim oameni, 4 00:00:10,180 --> 00:00:12,480 -places we go, and the stuff we read. +călătorim și citim . 5 00:00:13,280 --> 00:00:14,640 -Let me explain it better. +Lăsați-mă să vă explic mai bine. 6 00:00:14,920 --> 00:00:17,740 @@ -40,126 +40,126 @@ and so much more information about you and your life 10 -00:00:29,620 --> 00:00:32,460 +00:00:29,200 --> 00:00:31,500 which you probably didn't mean to share with unknown strangers, 11 -00:00:32,920 --> 00:00:35,840 +00:00:31,700 --> 00:00:34,000 who could easily use this data to exploit you. 12 -00:00:36,220 --> 00:00:38,120 -But not if you're using Tor! +00:00:34,500 --> 00:00:37,000 +Dar nu dacă utilizați Tor! 13 -00:00:39,140 --> 00:00:42,840 +00:00:37,140 --> 00:00:40,840 Tor Browser protects our privacy and identity on the Internet. 14 -00:00:43,560 --> 00:00:46,760 +00:00:41,560 --> 00:00:44,760 Tor secures your connection with three layers of encryption 15 -00:00:46,940 --> 00:00:51,760 +00:00:44,940 --> 00:00:49,760 and passes it through three voluntarily operated servers around the world, 16 -00:00:52,280 --> 00:00:55,520 +00:00:50,280 --> 00:00:53,520 which enables us to communicate anonymously over the Internet. 17 -00:00:58,560 --> 00:01:00,280 +00:00:56,560 --> 00:00:58,280 Tor also protects our data 18 -00:01:00,400 --> 00:01:03,900 +00:00:58,400 --> 00:01:01,900 against corporate or government targeted and mass surveillance. 19 -00:01:04,880 --> 00:01:09,340 +00:01:02,880 --> 00:01:07,340 Perhaps you live in a repressive country which tries to control and surveil the Internet. 20 -00:01:09,900 --> 00:01:13,800 +00:01:07,900 --> 00:01:11,800 Or perhaps you don't want big corporations taking advantage of your personal information. 21 -00:01:14,880 --> 00:01:17,640 +00:01:12,880 --> 00:01:15,640 Tor makes all of its users to look the same 22 -00:01:17,920 --> 00:01:20,800 +00:01:15,920 --> 00:01:18,800 which confuses the observer and makes you anonymous. 23 -00:01:21,500 --> 00:01:24,980 +00:01:19,500 --> 00:01:22,980 So, the more people use the Tor network, the stronger it gets 24 -00:01:25,140 --> 00:01:29,800 +00:01:23,140 --> 00:01:27,800 as it's easier to hide in a crowd of people who look exactly the same. 25 -00:01:30,700 --> 00:01:33,240 +00:01:28,700 --> 00:01:31,240 You can bypass the censorship without being worried about 26 -00:01:33,400 --> 00:01:36,100 +00:01:31,400 --> 00:01:34,100 the censor knowing what you do on the Internet. 27 -00:01:38,540 --> 00:01:41,440 +00:01:36,540 --> 00:01:39,440 The ads won't follow you everywhere for months, 28 -00:01:41,640 --> 00:01:43,300 +00:01:39,640 --> 00:01:41,300 starting when you first clicked on a product. 29 -00:01:45,880 --> 00:01:49,380 +00:01:43,880 --> 00:01:47,380 By using Tor, the sites you visit won't even know who you are, 30 -00:01:49,540 --> 00:01:51,760 +00:01:47,540 --> 00:01:49,760 from what part of the world you're visiting them, 31 -00:01:51,920 --> 00:01:53,920 +00:01:49,920 --> 00:01:51,920 unless you login and tell them so. 32 -00:01:56,200 --> 00:01:57,840 -By downloading and using Tor, +00:01:54,200 --> 00:01:55,840 +Descărcând și utilizând Tor, 33 -00:01:58,200 --> 00:02:00,560 -you can protect the people -who need anonymity, +00:01:56,200 --> 00:01:58,560 +puteți proteja oamenii +care au nevoie de anonimat, 34 -00:02:00,880 --> 00:02:03,640 -like activists, journalists and bloggers. +00:01:58,880 --> 00:02:01,640 +precum activiștii, jurnaliștii și blogger-ii. 35 -00:02:04,000 --> 00:02:09,000 -Download and use Tor! Or run a relay! +00:02:02,000 --> 00:02:07,000 +Descărcați și utilizați Tor! Sau rulați un releu!

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 20 May '15

20 May '15

commit a1d1a5bbdbe6dd60127e133920f4c293038b16fd Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 20 07:16:02 2015 +0000 Update translations for torbutton-torbuttondtd --- ro/torbutton.dtd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ro/torbutton.dtd b/ro/torbutton.dtd index 73f2cd4..eee42b0 100644 --- a/ro/torbutton.dtd +++ b/ro/torbutton.dtd @@ -153,8 +153,8 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.sec_caption "Nivel securitate"> <!ENTITY torbutton.prefs.sec_low "Scăzut (implicit)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Aceasta asigură cea mai utilizabilă experiență."> +<!ENTITY torbutton.prefs.sec_low_desc "La acest nivel de securitate, toate funcțiile navigatorului sunt activate."> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> <!ENTITY torbutton.prefs.sec_med_low "Mediu-scăzut"> <!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> @@ -163,24 +163,24 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripturile pe unele site-uri poate rula încet."> +<!ENTITY torbutton.prefs.sec_jar_desc "Fișierele JAR distante sunt blocate."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML este dezactivat."> <!ENTITY torbutton.prefs.sec_med_high "Mediu-înalt"> <!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> +<!ENTITY torbutton.prefs.sec_svg_desc "Unele tipuri de imagini sunt dezactivate."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Imaginile SVG sunt dezactivate"> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript este dezactivat implicit pe toate site-urile ne-HTTPS."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "Înalt"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript este dezactivat implicit pe toate site-urile."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "Cele mai multe formate audio și video sunt dezactivate."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM este singurul codec care rămâne activat."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Unele fonturi și pictograme pot fi afișate incorect."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.prefs.sec_custom "Valori personalizate"> <!ENTITY torbutton.circuit_display.title "Circuit Tor pentru acest site">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 20 May '15

20 May '15

commit 0fe34df27d38668b8139625ea15cee35bc060979 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 20 07:15:58 2015 +0000 Update translations for torbutton-torbuttonproperties --- ro/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ro/torbutton.properties b/ro/torbutton.properties index 1722ec4..49f4ffe 100644 --- a/ro/torbutton.properties +++ b/ro/torbutton.properties @@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Activeaza Tor torbutton.button.tooltip.enabled = Opreşte Tor torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP necunoscut -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = Site Onion torbutton.circuit_display.this_browser = Acest navigator -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = releu torbutton.circuit_display.tor_bridge = Punte torbutton.circuit_display.unknown_country = Țară necunoscută torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. @@ -72,7 +72,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem +profileProblemTitle=%S Problemă profil profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again.

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 20 May '15

20 May '15

commit 58d1b24e0c6ab526e00b37ac31e6c25544229d44 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 20 07:15:40 2015 +0000 Update translations for tor-launcher-network-settings --- ro/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ro/network-settings.dtd b/ro/network-settings.dtd index d5f4ea3..a3c740d 100644 --- a/ro/network-settings.dtd +++ b/ro/network-settings.dtd @@ -9,13 +9,13 @@ <!ENTITY torSettings.firstQuestion "Care din următoarele descrie cel mai bine situația dvs?"> <!ENTITY torSettings.configurePrompt1 "Această conexiune la internet a computerului este cenzurată sau prin proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Am nevoie să configurez puntea sau configurările locale proxy."> <!ENTITY torSettings.configure "Configuraţi "> <!ENTITY torSettings.connectPrompt2 "Vreau sa ma conectez direct la reţeaua Tor ."> <!ENTITY torSettings.connectPrompt3 "Aceasta funcționează în cele mai multe situații."> <!ENTITY torSettings.connect "Conectare"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Are nevoie acest computer să utilizeze un proxy local pentru accesarea internetului?">  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> <!ENTITY torSettings.enterProxy "Introduceţi setările pentru proxy ."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Opțional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Acest computer are nevoie să utilizeze un proxy local pentru accesarea internetului."> <!ENTITY torsettings.useProxy.type "Tip proxy:"> <!ENTITY torsettings.useProxy.address "Adresă:"> <!ENTITY torsettings.useProxy.address.placeholder "Adresă IP sau hostname">

1 0

[metrics-lib/master] Update copyright to 2015.
by karsten＠torproject.org 19 May '15

19 May '15

commit 42c2f6de12375c67d958b454ec885b2516673358 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 15 17:01:05 2015 +0200 Update copyright to 2015. --- src/org/torproject/descriptor/BandwidthHistory.java | 2 +- src/org/torproject/descriptor/BridgeNetworkStatus.java | 2 +- src/org/torproject/descriptor/BridgePoolAssignment.java | 2 +- src/org/torproject/descriptor/Descriptor.java | 2 +- src/org/torproject/descriptor/DescriptorDownloader.java | 2 +- src/org/torproject/descriptor/DescriptorFile.java | 2 +- src/org/torproject/descriptor/DescriptorParseException.java | 2 +- src/org/torproject/descriptor/DescriptorParser.java | 2 +- src/org/torproject/descriptor/DescriptorReader.java | 2 +- src/org/torproject/descriptor/DescriptorRequest.java | 2 +- src/org/torproject/descriptor/DescriptorSourceFactory.java | 2 +- src/org/torproject/descriptor/DirSourceEntry.java | 2 +- src/org/torproject/descriptor/DirectoryKeyCertificate.java | 2 +- src/org/torproject/descriptor/DirectorySignature.java | 2 +- src/org/torproject/descriptor/ExitList.java | 2 +- src/org/torproject/descriptor/ExitListEntry.java | 2 +- src/org/torproject/descriptor/ExtraInfoDescriptor.java | 2 +- .../torproject/descriptor/ImplementationNotAccessibleException.java | 2 +- src/org/torproject/descriptor/Microdescriptor.java | 2 +- src/org/torproject/descriptor/NetworkStatusEntry.java | 2 +- src/org/torproject/descriptor/RelayDirectory.java | 2 +- src/org/torproject/descriptor/RelayNetworkStatus.java | 2 +- src/org/torproject/descriptor/RelayNetworkStatusConsensus.java | 2 +- src/org/torproject/descriptor/RelayNetworkStatusVote.java | 2 +- src/org/torproject/descriptor/RouterStatusEntry.java | 2 +- src/org/torproject/descriptor/ServerDescriptor.java | 2 +- src/org/torproject/descriptor/TorperfResult.java | 2 +- src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java | 2 +- src/org/torproject/descriptor/impl/BlockingIteratorImpl.java | 2 +- src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java | 2 +- src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java | 2 +- src/org/torproject/descriptor/impl/DescriptorDownloaderImpl.java | 2 +- src/org/torproject/descriptor/impl/DescriptorFileImpl.java | 2 +- src/org/torproject/descriptor/impl/DescriptorImpl.java | 2 +- src/org/torproject/descriptor/impl/DescriptorParseException.java | 2 +- src/org/torproject/descriptor/impl/DescriptorParserImpl.java | 2 +- src/org/torproject/descriptor/impl/DescriptorReaderImpl.java | 2 +- src/org/torproject/descriptor/impl/DescriptorRequestImpl.java | 2 +- src/org/torproject/descriptor/impl/DirSourceEntryImpl.java | 2 +- src/org/torproject/descriptor/impl/DirectoryDownloader.java | 2 +- src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java | 2 +- src/org/torproject/descriptor/impl/DirectorySignatureImpl.java | 2 +- src/org/torproject/descriptor/impl/DownloadCoordinator.java | 2 +- src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java | 2 +- src/org/torproject/descriptor/impl/ExitListEntryImpl.java | 2 +- src/org/torproject/descriptor/impl/ExitListImpl.java | 2 +- src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java | 2 +- src/org/torproject/descriptor/impl/MicrodescriptorImpl.java | 2 +- src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java | 2 +- src/org/torproject/descriptor/impl/NetworkStatusImpl.java | 2 +- src/org/torproject/descriptor/impl/ParseHelper.java | 2 +- src/org/torproject/descriptor/impl/RelayDirectoryImpl.java | 2 +- .../torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java | 2 +- src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java | 2 +- src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java | 2 +- src/org/torproject/descriptor/impl/RouterStatusEntryImpl.java | 2 +- src/org/torproject/descriptor/impl/ServerDescriptorImpl.java | 2 +- src/org/torproject/descriptor/impl/TorperfResultImpl.java | 2 +- test/org/torproject/descriptor/impl/ConsensusBuilder.java | 2 +- test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java | 2 +- .../descriptor/impl/RelayNetworkStatusConsensusImplTest.java | 2 +- .../torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java | 2 +- test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java | 2 +- 63 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/org/torproject/descriptor/BandwidthHistory.java b/src/org/torproject/descriptor/BandwidthHistory.java index 1794ab4..4431ee2 100644 --- a/src/org/torproject/descriptor/BandwidthHistory.java +++ b/src/org/torproject/descriptor/BandwidthHistory.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/BridgeNetworkStatus.java b/src/org/torproject/descriptor/BridgeNetworkStatus.java index 31dfd47..296cd22 100644 --- a/src/org/torproject/descriptor/BridgeNetworkStatus.java +++ b/src/org/torproject/descriptor/BridgeNetworkStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/BridgePoolAssignment.java b/src/org/torproject/descriptor/BridgePoolAssignment.java index 43857ac..5186b2b 100644 --- a/src/org/torproject/descriptor/BridgePoolAssignment.java +++ b/src/org/torproject/descriptor/BridgePoolAssignment.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/Descriptor.java b/src/org/torproject/descriptor/Descriptor.java index a341ef7..267caf1 100644 --- a/src/org/torproject/descriptor/Descriptor.java +++ b/src/org/torproject/descriptor/Descriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/DescriptorDownloader.java b/src/org/torproject/descriptor/DescriptorDownloader.java index 5665e1f..1fc68a0 100644 --- a/src/org/torproject/descriptor/DescriptorDownloader.java +++ b/src/org/torproject/descriptor/DescriptorDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/DescriptorFile.java b/src/org/torproject/descriptor/DescriptorFile.java index 153b700..ec012ca 100644 --- a/src/org/torproject/descriptor/DescriptorFile.java +++ b/src/org/torproject/descriptor/DescriptorFile.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/DescriptorParseException.java b/src/org/torproject/descriptor/DescriptorParseException.java index 628896e..ff5707d 100644 --- a/src/org/torproject/descriptor/DescriptorParseException.java +++ b/src/org/torproject/descriptor/DescriptorParseException.java @@ -1,4 +1,4 @@ -/* Copyright 2014 The Tor Project +/* Copyright 2014--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/DescriptorParser.java b/src/org/torproject/descriptor/DescriptorParser.java index 1a4360b..7c59cea 100644 --- a/src/org/torproject/descriptor/DescriptorParser.java +++ b/src/org/torproject/descriptor/DescriptorParser.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/DescriptorReader.java b/src/org/torproject/descriptor/DescriptorReader.java index 5fe8197..0e2fe27 100644 --- a/src/org/torproject/descriptor/DescriptorReader.java +++ b/src/org/torproject/descriptor/DescriptorReader.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/DescriptorRequest.java b/src/org/torproject/descriptor/DescriptorRequest.java index 422d133..067cd1b 100644 --- a/src/org/torproject/descriptor/DescriptorRequest.java +++ b/src/org/torproject/descriptor/DescriptorRequest.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/DescriptorSourceFactory.java b/src/org/torproject/descriptor/DescriptorSourceFactory.java index 6d95649..9bfd81f 100644 --- a/src/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/org/torproject/descriptor/DescriptorSourceFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/DirSourceEntry.java b/src/org/torproject/descriptor/DirSourceEntry.java index 98bff22..57a3967 100644 --- a/src/org/torproject/descriptor/DirSourceEntry.java +++ b/src/org/torproject/descriptor/DirSourceEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/DirectoryKeyCertificate.java b/src/org/torproject/descriptor/DirectoryKeyCertificate.java index 9a4aeae..61986cf 100644 --- a/src/org/torproject/descriptor/DirectoryKeyCertificate.java +++ b/src/org/torproject/descriptor/DirectoryKeyCertificate.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/DirectorySignature.java b/src/org/torproject/descriptor/DirectorySignature.java index 012b770..ff706ea 100644 --- a/src/org/torproject/descriptor/DirectorySignature.java +++ b/src/org/torproject/descriptor/DirectorySignature.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/ExitList.java b/src/org/torproject/descriptor/ExitList.java index dc4a1f9..09d7c25 100644 --- a/src/org/torproject/descriptor/ExitList.java +++ b/src/org/torproject/descriptor/ExitList.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/ExitListEntry.java b/src/org/torproject/descriptor/ExitListEntry.java index 74438de..201a172 100644 --- a/src/org/torproject/descriptor/ExitListEntry.java +++ b/src/org/torproject/descriptor/ExitListEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/ExtraInfoDescriptor.java b/src/org/torproject/descriptor/ExtraInfoDescriptor.java index d19c590..7221a57 100644 --- a/src/org/torproject/descriptor/ExtraInfoDescriptor.java +++ b/src/org/torproject/descriptor/ExtraInfoDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/ImplementationNotAccessibleException.java b/src/org/torproject/descriptor/ImplementationNotAccessibleException.java index 3648a4b..fda3e24 100644 --- a/src/org/torproject/descriptor/ImplementationNotAccessibleException.java +++ b/src/org/torproject/descriptor/ImplementationNotAccessibleException.java @@ -1,4 +1,4 @@ -/* Copyright 2014 The Tor Project +/* Copyright 2014--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/Microdescriptor.java b/src/org/torproject/descriptor/Microdescriptor.java index f106f83..7715d35 100644 --- a/src/org/torproject/descriptor/Microdescriptor.java +++ b/src/org/torproject/descriptor/Microdescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2014 The Tor Project +/* Copyright 2014--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/NetworkStatusEntry.java b/src/org/torproject/descriptor/NetworkStatusEntry.java index cb15ce2..fb9163e 100644 --- a/src/org/torproject/descriptor/NetworkStatusEntry.java +++ b/src/org/torproject/descriptor/NetworkStatusEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2014 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/RelayDirectory.java b/src/org/torproject/descriptor/RelayDirectory.java index b8a9472..209c080 100644 --- a/src/org/torproject/descriptor/RelayDirectory.java +++ b/src/org/torproject/descriptor/RelayDirectory.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/RelayNetworkStatus.java b/src/org/torproject/descriptor/RelayNetworkStatus.java index 5d05f0c..acbdb90 100644 --- a/src/org/torproject/descriptor/RelayNetworkStatus.java +++ b/src/org/torproject/descriptor/RelayNetworkStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/RelayNetworkStatusConsensus.java b/src/org/torproject/descriptor/RelayNetworkStatusConsensus.java index 53eaf6b..0419acc 100644 --- a/src/org/torproject/descriptor/RelayNetworkStatusConsensus.java +++ b/src/org/torproject/descriptor/RelayNetworkStatusConsensus.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2014 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/RelayNetworkStatusVote.java b/src/org/torproject/descriptor/RelayNetworkStatusVote.java index eb8bf66..aeab268 100644 --- a/src/org/torproject/descriptor/RelayNetworkStatusVote.java +++ b/src/org/torproject/descriptor/RelayNetworkStatusVote.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/RouterStatusEntry.java b/src/org/torproject/descriptor/RouterStatusEntry.java index 6652e94..978e6e1 100644 --- a/src/org/torproject/descriptor/RouterStatusEntry.java +++ b/src/org/torproject/descriptor/RouterStatusEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/ServerDescriptor.java b/src/org/torproject/descriptor/ServerDescriptor.java index 4180adc..5fcd3b9 100644 --- a/src/org/torproject/descriptor/ServerDescriptor.java +++ b/src/org/torproject/descriptor/ServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/TorperfResult.java b/src/org/torproject/descriptor/TorperfResult.java index f1b7a9f..016a043 100644 --- a/src/org/torproject/descriptor/TorperfResult.java +++ b/src/org/torproject/descriptor/TorperfResult.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor; diff --git a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index f350740..136a6d7 100644 --- a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java +++ b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java index 477e6f1..aee669f 100644 --- a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java +++ b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index d0e4a42..5935c86 100644 --- a/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java index 9340245..01dc7b0 100644 --- a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java +++ b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DescriptorDownloaderImpl.java b/src/org/torproject/descriptor/impl/DescriptorDownloaderImpl.java index 3c093d1..490b1ac 100644 --- a/src/org/torproject/descriptor/impl/DescriptorDownloaderImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorDownloaderImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DescriptorFileImpl.java b/src/org/torproject/descriptor/impl/DescriptorFileImpl.java index 7ab9a24..440426d 100644 --- a/src/org/torproject/descriptor/impl/DescriptorFileImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorFileImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index 6881a09..306f6f2 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DescriptorParseException.java b/src/org/torproject/descriptor/impl/DescriptorParseException.java index 928b7a5..0f9add2 100644 --- a/src/org/torproject/descriptor/impl/DescriptorParseException.java +++ b/src/org/torproject/descriptor/impl/DescriptorParseException.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/org/torproject/descriptor/impl/DescriptorParserImpl.java index 992afee..b9af853 100644 --- a/src/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java index 94c1d2e..5517889 100644 --- a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java b/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java index e5c2ff5..5a5f020 100644 --- a/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java index 08d910e..5b65789 100644 --- a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java +++ b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DirectoryDownloader.java b/src/org/torproject/descriptor/impl/DirectoryDownloader.java index 60e08b5..f10fc83 100644 --- a/src/org/torproject/descriptor/impl/DirectoryDownloader.java +++ b/src/org/torproject/descriptor/impl/DirectoryDownloader.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java b/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java index 4d8a28f..3d1f797 100644 --- a/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java +++ b/src/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DirectorySignatureImpl.java b/src/org/torproject/descriptor/impl/DirectorySignatureImpl.java index 95a0d6c..4e56006 100644 --- a/src/org/torproject/descriptor/impl/DirectorySignatureImpl.java +++ b/src/org/torproject/descriptor/impl/DirectorySignatureImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinator.java b/src/org/torproject/descriptor/impl/DownloadCoordinator.java index 6d837a5..72cfeae 100644 --- a/src/org/torproject/descriptor/impl/DownloadCoordinator.java +++ b/src/org/torproject/descriptor/impl/DownloadCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java index 87256a4..067c38c 100644 --- a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java +++ b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/ExitListEntryImpl.java b/src/org/torproject/descriptor/impl/ExitListEntryImpl.java index a8b435d..a03e373 100644 --- a/src/org/torproject/descriptor/impl/ExitListEntryImpl.java +++ b/src/org/torproject/descriptor/impl/ExitListEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/ExitListImpl.java b/src/org/torproject/descriptor/impl/ExitListImpl.java index 5bf1366..53dc112 100644 --- a/src/org/torproject/descriptor/impl/ExitListImpl.java +++ b/src/org/torproject/descriptor/impl/ExitListImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index 5b13234..25847c4 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java b/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java index 3972cf7..7d47df0 100644 --- a/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/MicrodescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2014 The Tor Project +/* Copyright 2014--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 000c448..dac6052 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2014 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java index 10947f9..9f92b47 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java b/src/org/torproject/descriptor/impl/ParseHelper.java index 9353d3c..226bf80 100644 --- a/src/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/org/torproject/descriptor/impl/ParseHelper.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 3a1fd47..294faea 100644 --- a/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 4f1da6b..da75cf2 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2014 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index e1204d9..31e37db 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index eb91128..f43733e 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/RouterStatusEntryImpl.java b/src/org/torproject/descriptor/impl/RouterStatusEntryImpl.java index 68f549e..c6942e8 100644 --- a/src/org/torproject/descriptor/impl/RouterStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/RouterStatusEntryImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index fd60236..f9a1e48 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/src/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/org/torproject/descriptor/impl/TorperfResultImpl.java index 91033ec..d865802 100644 --- a/src/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/test/org/torproject/descriptor/impl/ConsensusBuilder.java b/test/org/torproject/descriptor/impl/ConsensusBuilder.java index 928087d..9d72e1e 100644 --- a/test/org/torproject/descriptor/impl/ConsensusBuilder.java +++ b/test/org/torproject/descriptor/impl/ConsensusBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index a92a4a7..9740eae 100644 --- a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index c5ec7a3..0707d55 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2011 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index c301bf1..a200dc4 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2011 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl; diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 498c866..a3329be 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -1,4 +1,4 @@ -/* Copyright 2012 The Tor Project +/* Copyright 2012--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.descriptor.impl;

1 0

[tor/master] Bump maint-0.2.6 to 0.2.6.8
by nickm＠torproject.org 19 May '15

19 May '15

commit b3a225fb13d57125888bc6e2c84bdca9abce00f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 14:48:09 2015 -0400 Bump maint-0.2.6 to 0.2.6.8 --- 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 cc271c8..81ef2c7 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.7-dev]) +AC_INIT([tor],[0.2.6.8]) 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 b8798d8..1764614 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.7-dev" +!define VERSION "0.2.6.8" !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 b014a12..c0ab2de 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.7-dev" +#define VERSION "0.2.6.8"

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 19 May '15

19 May '15

commit 32bd533ddac5bd7d594a81119449b3d30206eedd Merge: d5e4a63 b3a225f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 14:59:39 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6'

1 0

[tor/maint-0.2.6] Bump maint-0.2.6 to 0.2.6.8
by nickm＠torproject.org 19 May '15

19 May '15

1 0

[tor/release-0.2.6] add backport notes to changelog
by nickm＠torproject.org 19 May '15

19 May '15

commit 5c8440b13bde6c8847b9a54d12dadde26f6d37ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 19 14:59:27 2015 -0400 add backport notes to changelog --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5eab7c..25ab6e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,13 +3,13 @@ Changes in version 0.2.6.8 - 2015-05-2? fixes an authority-side bug in assigning the HSDir flag. All directory authorities should upgrade. - o Major bugfixes (hidden services): + o Major bugfixes (hidden services, backport from 0.2.7.1-alpha): - Revert commit that made directory authorities assign the HSDir flag to relay without a DirPort; this was bad because such relays can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix on tor-0.2.6.3-alpha. - o Minor bugfixes (hidden service): + o Minor bugfixes (hidden service, backport from 0.2.7.1-alpha): - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on a client authorized hidden service. Fixes bug 15823; bugfix on 0.2.1.6-alpha.

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
99
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2015