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

[translation]

commit f20b644108d40e38d16c348ba06058af7f594a73
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:47 2017 +

Update translations for exoneratorproperties_completed
---
 ko/exonerator.properties | 54 
 1 file changed, 54 insertions(+)

diff --git a/ko/exonerator.properties b/ko/exonerator.properties
new file mode 100644
index 000..59c00c8
--- /dev/null
+++ b/ko/exonerator.properties
@@ -0,0 +1,54 @@
+form.explanation=IP 주소와 날짜를 입력하여 해당 주소가 Tor 릴ë 
ˆì´ë¡œ 사용되었는지 확인하십시오.
+form.ip.label=IP 주소
+form.timestamp.label=날짜
+form.search.label=검색
+summary.heading=요약
+summary.serverproblem.dbnoconnect.title=서버 문제
+summary.serverproblem.dbnoconnect.body.text=데이터베이스에 연결할 
수 없습니다. 나중에 다시 시도 해주십시오. 이 문제가 
계속되면 %s을 하시기 바랍니다!
+summary.serverproblem.dbnoconnect.body.link=저희에게 알려주세요
+summary.serverproblem.dbempty.title=서버 문제
+summary.serverproblem.dbempty.body.text=데이터베이스가 비어있는 것 
같습니다. 나중에 다시 시도 해주십시오. 이 문제가 
계속되면 %s을 하시기 바랍니다!
+summary.serverproblem.dbempty.body.link=저희에게 알려주세요
+summary.invalidparams.notimestamp.title=날짜 매개 변수가 지정되지 
않음
+summary.invalidparams.notimestamp.body=죄송합니다. 날짜 매개 
변수도 입력 해야 합니다.
+summary.invalidparams.noip.title=IP 주소 매개 변수가 지정되지 않음
+summary.invalidparams.noip.body=죄송합니다. IP 주소 매개 변수도 입
력해야 합니다.
+summary.invalidparams.timestamprange.title=날짜 매개 변수가 범위를 
벗어났습니다.
+summary.invalidparams.timestamprange.body=죄송합니다. 데이터베
이스에 %s의 데이터가 없습니다.%s에서 %s 사이의 날짜를 선
택하십시오.
+summary.invalidparams.invalidip.title=잘못된 IP 주소 매개 변수
+summary.invalidparams.invalidip.body=죄송합니다. %s은 유효한 IP 
주소가 아닙니다. 예상되는 IP 주소 형식은 %s 또는 %s 입니다.
+summary.invalidparams.invalidtimestamp.title=날짜 매개 변수가 
잘못되었습니다.
+summary.invalidparams.invalidtimestamp.body=죄송합니다. %s는 잘못된 
날짜입니다. 올바른 날짜 형식은 %s입니다.
+summary.serverproblem.nodata.title=서버 문제
+summary.serverproblem.nodata.body.text=데이터베이스에 요청한 날
짜의 데이터가 없습니다. 나중에 다시 시도 해주십시오. 이 
문제가 계속되면 %s를 하시기 바랍니다.
+summary.serverproblem.nodata.body.link=저희에게 알려주세요
+summary.negativesamenetwork.title=결과가 부정적임
+summary.negativesamenetwork.body=%s의 날짜 또는 시간 내에 IP 주소 
%s를 찾지 못했습니다. 그러나 같은 / %d 네트워크에서 Tor 릴ë 
ˆì´ì˜ 다른 IP 주소를 찾아 냈습니다.
+summary.positive.title=결과가 긍정적임
+summary.positive.body=Tor 클라이언트가 알 수 있는 %s일 또는 1 일 
내에 IP 주소 %s에 하나 이상의 Tor 릴레이가 있음을 
발견했습니다.
+summary.negative.title=결과가 부정적임
+summary.negative.body=%s의 날짜 또는 시간 내에 IP 주소 %s를 찾지 
못했습니다.
+technicaldetails.heading=기술적인 세부사항
+technicaldetails.pre=%s의 1 일 또는 1 일 내에 IP 주소 %s를 조회 
중입니다. Tor 클라이언트는 이 Tor를 선택하여 회로를 만들 
수 있습니다.
+technicaldetails.colheader.timestamp=타임 스탬프 (UTC)
+technicaldetails.colheader.ip=IP 주소
+technicaldetails.colheader.fingerprint=신원 지문
+technicaldetails.colheader.nickname=별명
+technicaldetails.colheader.exit=중계 종료
+technicaldetails.nickname.unknown=알 수 없음
+technicaldetails.exit.unknown=알 수 없음
+technicaldetails.exit.yes=예
+technicaldetails.exit.no=아니오
+permanentlink.heading=영구 링크
+footer.abouttor.heading=Tor에 대해서
+footer.abouttor.body.text=Tor는 %s에 의하여 인터넷 트래픽을 익명
화 하는 국제 소프트웨어 프로젝트입니다. 따라서 Tor 
릴레이에서 트래픽이 발생하면 이 트래픽은 일반적으로 
중계 운영자가 아닌 Tor를 사용하는 사람으로부터 
발생합니다. Tor 프로젝트 및 Tor 중계 운영자는 
네트워크를 통과하는 트래픽에 대한 기록이 없으므로 
출처에 대한 정보를 제공 할 수 없습니다. 더 자세한 ì 
•ë³´ë¥¼ 원할 경우 망설이지 마시고 %s에 연락하십시오. 
+footer.abouttor.body.link1=패킷을 암호화하고 대상에 도달하기 ì 
„에 일련의 홉을 통해 패킷을 보냅니다.
+footer.abouttor.body.link2=Tor에 대해서 더 알아보기 »
+footer.abouttor.body.link3=The Tor Project, Inc에 연락하기.

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

[translation]

commit 0638a1b193fd7ce60678ee278eeea3e0e6a2be36
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:51 2017 +

Update translations for tor-browser-manual
---
 ko/ko.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ko/ko.po b/ko/ko.po
index 0f4d366..ed83507 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -6,12 +6,13 @@
 # 손상우 , 2016
 # jshyun , 2016
 # Dr.what , 2016
+# snotree , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Dr.what , 2016\n"
+"Last-Translator: snotree , 2017\n"
 "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -497,7 +498,7 @@ msgstr ""
 
 #: index.page:6
 msgid "Tor Browser User Manual"
-msgstr ""
+msgstr "Tor 브라우저 사용자 설명서"
 
 #: known-issues.page:6
 msgid "A list of known issues."

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

[tor-commits] [translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed

[translation]

commit 990ce43817ae8770250e815ead80c33344949510
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:26 2017 +

Update translations for tor-messenger-privproperties_completed
---
 ko/priv.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ko/priv.properties b/ko/priv.properties
new file mode 100644
index 000..2464fd7
--- /dev/null
+++ b/ko/priv.properties
@@ -0,0 +1,2 @@
+priv.account=%S의 개인 키 생성 중 (%S) ...
+priv.failed=키 생성 실패: %S

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

[tor-commits] [translation/tor-messenger-uiproperties] Update translations for tor-messenger-uiproperties

[translation]

commit 702e29a83c40eeac4ad01352bf2805b4d52a5569
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:30 2017 +

Update translations for tor-messenger-uiproperties
---
 ko/ui.properties | 42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/ko/ui.properties b/ko/ui.properties
index bf06961..0976ab5 100644
--- a/ko/ui.properties
+++ b/ko/ui.properties
@@ -1,27 +1,27 @@
 start.label=비밀 대화 시작
 end.label=비밀 대화 끝
-refresh.label=Refresh private conversation
-auth.label=Verify your contact's identity
-auth.cancel=Cancel
+refresh.label=비밀 대화 새로고침
+auth.label=연락처의 신원 확인
+auth.cancel=취소
 auth.cancelAccessKey=C
-auth.error=An error occurred while verifying your contact's identity.
-auth.success=Verifying your contact's identity completed successfully.
-auth.successThem=Your contact has successfully verified your identity. You may 
want to verify their identity as well by asking your own question.
-auth.fail=Failed to verify your contact's identity.
-auth.waiting=Waiting for contact ...
-reauth.label=Reverify your contact's identity
+auth.error=연락처의 신원을 확인하는 중에 오류가 
발생했습니다.
+auth.success=연락처의 신원 확인이 성공적으로 
완료되었습니다.
+auth.successThem=귀하의 연락처가 귀하의 신원을 
확인했습니다. 자신의 질문을 통해 자신의 신원을 확인할 
수도 있습니다.
+auth.fail=연락처의 신원을 확인하지 못했습니다.
+auth.waiting=접속을 기다리는 중 ...
+reauth.label=연락처의 신원을 재확인
 prefs.label=OTR 환경 설정
-alert.start=Attempting to start a private conversation with %S.
-alert.refresh=Attempting to refresh the private conversation with %S.
-alert.gone_insecure=Private conversation with %S ended.
-finger.seen=%S is contacting you from an unrecognized computer. You should 
verify this contact's identity.
-finger.unseen=%S's identity has not been verified yet. You should verify this 
contact's identity.
+alert.start=%S와 비밀 대화를 새로 시작 하려고 합니다.
+alert.refresh=%S로 비밀 대화를 새로 고치려고 합니다.
+alert.gone_insecure=%S의 비밀 대화가 종료되었습니다.
+finger.seen=%S가 식별 할 수 없는 컴퓨터에서 당신에게 
연락하고 있습니다. 이 연락처의 신원을 확인 해야 합니다.
+finger.unseen=%S의 신원이 아직 확인되지 않았습니다. 이 
연락처의 신원을 확인 해야 합니다.
 finger.verify=검증
 verify.accessKey=V
-state.not_private=The current conversation is not private.
-state.unverified=The current conversation is private but %S's identity has not 
been verified.
-state.private=The current conversation is private and %S's identity has been 
verified.
-state.finished=%S has ended their private conversation with you; you should do 
the same.
-afterauth.private=You have verified %S's identity.
-afterauth.unverified=%S's identity has not been verified.
-buddycontextmenu.label=Add Contact's Fingerprint
+state.not_private=현재 대화는 비공개가 아닙니다.
+state.unverified=현재 대화는 비공개이지만 %S의 신원은 
확인되지 않았습니다.
+state.private=현재 대화는 비공개이며 %S의 신원이 
확인되었습니다.
+state.finished=%S가 귀하와 비밀 대화를 종료했습니다. 당신도 
똑같이 해야 합니다.
+afterauth.private=%S의 신원을 확인했습니다.
+afterauth.unverified=%S의 신원이 확인되지 않았습니다.
+buddycontextmenu.label=연락처의 지문 추가

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

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

[translation]

commit 20bece7ece187c7f817bf78559ba9b473dda9d51
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:43 2017 +

Update translations for exoneratorproperties
---
 ko/exonerator.properties | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ko/exonerator.properties b/ko/exonerator.properties
index e11a40d..59c00c8 100644
--- a/ko/exonerator.properties
+++ b/ko/exonerator.properties
@@ -11,25 +11,25 @@ summary.serverproblem.dbempty.body.text=데이터베
이스가 비어있는 것 
 summary.serverproblem.dbempty.body.link=저희에게 알려주세요
 summary.invalidparams.notimestamp.title=날짜 매개 변수가 지정되지 
않음
 summary.invalidparams.notimestamp.body=죄송합니다. 날짜 매개 
변수도 입력 해야 합니다.
-summary.invalidparams.noip.title=No IP address parameter given
-summary.invalidparams.noip.body=Sorry, you also need to provide an IP address 
parameter.
-summary.invalidparams.timestamprange.title=Date parameter out of range
-summary.invalidparams.timestamprange.body=Sorry, the database does not contain 
any data from %s. Please pick a date between %s and %s.
-summary.invalidparams.invalidip.title=Invalid IP address parameter
-summary.invalidparams.invalidip.body=Sorry, %s is not a valid IP address. The 
expected IP address formats are %s or %s.
-summary.invalidparams.invalidtimestamp.title=Invalid date parameter
-summary.invalidparams.invalidtimestamp.body=Sorry, %s is not a valid date. The 
expected date format is %s.
+summary.invalidparams.noip.title=IP 주소 매개 변수가 지정되지 않음
+summary.invalidparams.noip.body=죄송합니다. IP 주소 매개 변수도 입
력해야 합니다.
+summary.invalidparams.timestamprange.title=날짜 매개 변수가 범위를 
벗어났습니다.
+summary.invalidparams.timestamprange.body=죄송합니다. 데이터베
이스에 %s의 데이터가 없습니다.%s에서 %s 사이의 날짜를 선
택하십시오.
+summary.invalidparams.invalidip.title=잘못된 IP 주소 매개 변수
+summary.invalidparams.invalidip.body=죄송합니다. %s은 유효한 IP 
주소가 아닙니다. 예상되는 IP 주소 형식은 %s 또는 %s 입니다.
+summary.invalidparams.invalidtimestamp.title=날짜 매개 변수가 
잘못되었습니다.
+summary.invalidparams.invalidtimestamp.body=죄송합니다. %s는 잘못된 
날짜입니다. 올바른 날짜 형식은 %s입니다.
 summary.serverproblem.nodata.title=서버 문제
-summary.serverproblem.nodata.body.text=The database does not contain any data 
for the requested date. Please try again later. If this problem persists, 
please %s!
+summary.serverproblem.nodata.body.text=데이터베이스에 요청한 날
짜의 데이터가 없습니다. 나중에 다시 시도 해주십시오. 이 
문제가 계속되면 %s를 하시기 바랍니다.
 summary.serverproblem.nodata.body.link=저희에게 알려주세요
-summary.negativesamenetwork.title=Result is negative
-summary.negativesamenetwork.body=We did not find IP address %s on or within a 
day of %s. But we did find other IP addresses of Tor relays in the same /%d 
network around the time:
-summary.positive.title=Result is positive
-summary.positive.body=We found one or more Tor relays on IP address %s on or 
within a day of %s that Tor clients were likely to know.
-summary.negative.title=Result is negative
-summary.negative.body=We did not find IP address %s on or within a day of %s.
-technicaldetails.heading=Technical details
-technicaldetails.pre=Looking up IP address %s on or within one day of %s. Tor 
clients could have selected this or these Tor relays to build circuits.
+summary.negativesamenetwork.title=결과가 부정적임
+summary.negativesamenetwork.body=%s의 날짜 또는 시간 내에 IP 주소 
%s를 찾지 못했습니다. 그러나 같은 / %d 네트워크에서 Tor 릴ë 
ˆì´ì˜ 다른 IP 주소를 찾아 냈습니다.
+summary.positive.title=결과가 긍정적임
+summary.positive.body=Tor 클라이언트가 알 수 있는 %s일 또는 1 일 
내에 IP 주소 %s에 하나 이상의 Tor 릴레이가 있음을 
발견했습니다.
+summary.negative.title=결과가 부정적임
+summary.negative.body=%s의 날짜 또는 시간 내에 IP 주소 %s를 찾지 
못했습니다.
+technicaldetails.heading=기술적인 세부사항
+technicaldetails.pre=%s의 1 일 또는 1 일 내에 IP 주소 %s를 조회 
중입니다. Tor 클라이언트는 이 Tor를 선택하여 회로를 만들 
수 있습니다.
 technicaldetails.colheader.timestamp=타임 스탬프 (UTC)
 technicaldetails.colheader.ip=IP 주소
 technicaldetails.colheader.fingerprint=신원 지문

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

[tor-commits] [translation/tor-messenger-privdtd_completed] Update translations for tor-messenger-privdtd_completed

[translation]

commit 8e70778062efa3ce85bd5a05c5d693ab3ce66b06
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:19 2017 +

Update translations for tor-messenger-privdtd_completed
---
 ko/priv.dtd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ko/priv.dtd b/ko/priv.dtd
new file mode 100644
index 000..9ec0e2b
--- /dev/null
+++ b/ko/priv.dtd
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-uiproperties_completed] Update translations for tor-messenger-uiproperties_completed

[translation]

commit 42d9b5bbb03fbfe3eb58b1707f3f73ac1caf1b5e
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:33 2017 +

Update translations for tor-messenger-uiproperties_completed
---
 ko/ui.properties | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/ko/ui.properties b/ko/ui.properties
new file mode 100644
index 000..0976ab5
--- /dev/null
+++ b/ko/ui.properties
@@ -0,0 +1,27 @@
+start.label=비밀 대화 시작
+end.label=비밀 대화 끝
+refresh.label=비밀 대화 새로고침
+auth.label=연락처의 신원 확인
+auth.cancel=취소
+auth.cancelAccessKey=C
+auth.error=연락처의 신원을 확인하는 중에 오류가 
발생했습니다.
+auth.success=연락처의 신원 확인이 성공적으로 
완료되었습니다.
+auth.successThem=귀하의 연락처가 귀하의 신원을 
확인했습니다. 자신의 질문을 통해 자신의 신원을 확인할 
수도 있습니다.
+auth.fail=연락처의 신원을 확인하지 못했습니다.
+auth.waiting=접속을 기다리는 중 ...
+reauth.label=연락처의 신원을 재확인
+prefs.label=OTR 환경 설정
+alert.start=%S와 비밀 대화를 새로 시작 하려고 합니다.
+alert.refresh=%S로 비밀 대화를 새로 고치려고 합니다.
+alert.gone_insecure=%S의 비밀 대화가 종료되었습니다.
+finger.seen=%S가 식별 할 수 없는 컴퓨터에서 당신에게 
연락하고 있습니다. 이 연락처의 신원을 확인 해야 합니다.
+finger.unseen=%S의 신원이 아직 확인되지 않았습니다. 이 
연락처의 신원을 확인 해야 합니다.
+finger.verify=검증
+verify.accessKey=V
+state.not_private=현재 대화는 비공개가 아닙니다.
+state.unverified=현재 대화는 비공개이지만 %S의 신원은 
확인되지 않았습니다.
+state.private=현재 대화는 비공개이며 %S의 신원이 
확인되었습니다.
+state.finished=%S가 귀하와 비밀 대화를 종료했습니다. 당신도 
똑같이 해야 합니다.
+afterauth.private=%S의 신원을 확인했습니다.
+afterauth.unverified=%S의 신원이 확인되지 않았습니다.
+buddycontextmenu.label=연락처의 지문 추가

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

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

[translation]

commit e50c05c5bcc7bb570a81da3781dd3c8d8cb2e77c
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:08 2017 +

Update translations for tor-messenger-prefsdtd
---
 ko/prefs.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ko/prefs.dtd b/ko/prefs.dtd
index 37f07f8..d111a8e 100644
--- a/ko/prefs.dtd
+++ b/ko/prefs.dtd
@@ -9,14 +9,14 @@
 
 
 
-
-
+
+
 
 
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-privproperties] Update translations for tor-messenger-privproperties

[translation]

commit 9cb8d2e20b25e63f84af91272dba8443560583b0
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:22 2017 +

Update translations for tor-messenger-privproperties
---
 ko/priv.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ko/priv.properties b/ko/priv.properties
index f8a9f15..2464fd7 100644
--- a/ko/priv.properties
+++ b/ko/priv.properties
@@ -1,2 +1,2 @@
-priv.account=Generating private key for %S (%S) ...
-priv.failed=Generating key failed: %S
+priv.account=%S의 개인 키 생성 중 (%S) ...
+priv.failed=키 생성 실패: %S

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

[tor-commits] [translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

[translation]

commit 7d3d5797d66d93ff4913a5191c7c911618522a4e
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:12 2017 +

Update translations for tor-messenger-prefsdtd_completed
---
 ko/prefs.dtd | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/ko/prefs.dtd b/ko/prefs.dtd
new file mode 100644
index 000..d111a8e
--- /dev/null
+++ b/ko/prefs.dtd
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd

[translation]

commit b89172932324bf68f8dfe95b77dfd9362cc48698
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:15 2017 +

Update translations for tor-messenger-privdtd
---
 ko/priv.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko/priv.dtd b/ko/priv.dtd
index 09d6522..9ec0e2b 100644
--- a/ko/priv.dtd
+++ b/ko/priv.dtd
@@ -1,2 +1,2 @@
-
+
 
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties

[translation]

commit bd89d3c813b86fb31c724c9d6dcee5e34c3f00f2
Author: Translation commit bot 
Date:   Sat Jul 15 05:48:02 2017 +

Update translations for tor-messenger-otrproperties
---
 ko/otr.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ko/otr.properties b/ko/otr.properties
index 11b23be..bf665ac 100644
--- a/ko/otr.properties
+++ b/ko/otr.properties
@@ -22,10 +22,10 @@ error.not_priv=You sent encrypted data to %S, who wasn't 
expecting it.
 error.unreadable=You transmitted an unreadable encrypted message.
 error.malformed=You transmitted a malformed data message.
 resent=[resent]
-tlv.disconnected=%S has ended their private conversation with you; you should 
do the same.
+tlv.disconnected=%S가 귀하와 비밀 대화를 종료했습니다. 당신
도 똑같이 해야 합니다.
 query.msg=%S has requested an Off-the Record private conversation. However, 
you do not have a plugin to support that. See http://otr.cypherpunks.ca/ for 
more information.
-trust.unused=Unused
-trust.not_private=Not Private
-trust.unverified=Unverified
-trust.private=Private
-trust.finished=Finished
+trust.unused=사용되지 않음
+trust.not_private=비공개가 아님
+trust.unverified=확인되지 않음
+trust.private=비공개
+trust.finished=완료됨

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

[tor-commits] [translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd

[translation]

commit cf58965f65140294b73caa99b53d1b80950c01fd
Author: Translation commit bot 
Date:   Sat Jul 15 05:47:44 2017 +

Update translations for tor-messenger-authdtd
---
 ko/auth.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko/auth.dtd b/ko/auth.dtd
index b90a62d..ce89c78 100644
--- a/ko/auth.dtd
+++ b/ko/auth.dtd
@@ -18,4 +18,4 @@
 
 
 
-
\ No newline at end of file
+
\ No newline at end of file

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

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

[translation]

commit b654a726c0af483651b8011d330c1968bfbd400a
Author: Translation commit bot 
Date:   Sat Jul 15 05:47:11 2017 +

Update translations for tor_animation
---
 ko.srt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko.srt b/ko.srt
index 8b472e0..2042f4a 100644
--- a/ko.srt
+++ b/ko.srt
@@ -147,5 +147,5 @@ Tor를 다운받고 사용함으로써,
 
 35
 00:02:02,000 --> 00:02:07,000
-Download and use Tor! Or run a relay!
+Tor를 다운로드 받고 사용하거나 아니면 중계를 시작하세요!
 

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

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

[translation]

commit 406cc2385bb9fa5d0bb22a442e8c520d287eb681
Author: Translation commit bot 
Date:   Sat Jul 15 05:46:22 2017 +

Update translations for tails-misc
---
 ko.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko.po b/ko.po
index bc6e735..8f499fe 100644
--- a/ko.po
+++ b/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-05 11:57+0200\n"
-"PO-Revision-Date: 2017-05-26 14:47+\n"
+"PO-Revision-Date: 2017-07-15 05:33+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"

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

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

[translation]

commit 0b2f7a32fc154354bffe1feade72753ac4bb32d2
Author: Translation commit bot 
Date:   Sat Jul 15 05:46:26 2017 +

Update translations for tails-misc_completed
---
 ko.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko.po b/ko.po
index bc6e735..8f499fe 100644
--- a/ko.po
+++ b/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-05 11:57+0200\n"
-"PO-Revision-Date: 2017-05-26 14:47+\n"
+"PO-Revision-Date: 2017-07-15 05:33+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

[translation]

commit 20d3d0262db97e606034433f0bf5687fd1fde63e
Author: Translation commit bot 
Date:   Sat Jul 15 05:46:33 2017 +

Update translations for abouttor-homepage_completed
---
 ko/aboutTor.dtd | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ko/aboutTor.dtd b/ko/aboutTor.dtd
index 49a40f7..65b9b76 100644
--- a/ko/aboutTor.dtd
+++ b/ko/aboutTor.dtd
@@ -19,10 +19,7 @@
 
 
 
-
-https://startpage.com/rth/search;>
-https://duckduckgo.com/html/;>
-https://search.disconnect.me/searchTerms/search?ses=Googlelocation_option=USsource=tor;>
+https://duckduckgo.com;>
 
 
 
@@ -32,6 +29,8 @@
 
 
 https://www.torproject.org/download/download.html.en#warning;>
+
+
 
 
 

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

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

[translation]

commit 5b390d239dd91d1dcc5db9b4eaddf2729462478c
Author: Translation commit bot 
Date:   Sat Jul 15 05:46:29 2017 +

Update translations for abouttor-homepage
---
 ko/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko/aboutTor.dtd b/ko/aboutTor.dtd
index cba2d80..65b9b76 100644
--- a/ko/aboutTor.dtd
+++ b/ko/aboutTor.dtd
@@ -30,7 +30,7 @@
 
 https://www.torproject.org/download/download.html.en#warning;>
 
-
+
 
 
 

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

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

[translation]

commit eac69a5d04532d3e288771f54bc9221265f3e64d
Author: Translation commit bot 
Date:   Sat Jul 15 05:46:03 2017 +

Update translations for tor-launcher-properties
---
 ko/torlauncher.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ko/torlauncher.properties b/ko/torlauncher.properties
index 818c6a0..7f21eb0 100644
--- a/ko/torlauncher.properties
+++ b/ko/torlauncher.properties
@@ -3,7 +3,7 @@
 
 torlauncher.error_title=Tor 브라우저 Launcher
 
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be 
due to an error in your torrc file, a bug in Tor or another program on your 
system, or faulty hardware. Until you fix the underlying problem and restart 
Tor, Tor Browser will not start.
+torlauncher.tor_exited_during_startup=시작하는 동안 Tor가 종
료되었습니다. 이것은 torrc 파일의 오류, Tor 또는 시스템의 
다른 프로그램의 버그 또는 하드웨어 결함으로 인한 것일 
수 있습니다. 기본 문제를 해결하고 Tor를 다시 시작할 
때까지 Tor 브라우저는 시작되지 않습니다.
 torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. 
이것은 Tor 자체의 오류, 사용자 시스템의 타 프로그램 또는 
하드웨어의 오류 때문일 수 있습니다. 사용자가 Tor를 
재시작 하기 전까진, Tor 브라우저는 어떠한 웹사이트에 ì 
‘속하지 않습니다. 문제가 계속된다면, 지원팀에게 당신의 
Tor 로그를 보내주십시오.
 torlauncher.tor_exited2=Tor를 재시작해도 브라우저 탭은 닫히지 
않음.
 torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어ë 
µìŠµë‹ˆë‹¤.
@@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S)
 
 torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S
 torlauncher.tor_missing=Tor 실행 파일이 없습니다.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-torlauncher.datadir_missing=The Tor data directory does not exist and could 
not be created.
+torlauncher.torrc_missing=torrc 파일이 사라졌으며 생성 할 수 
없습니다.
+torlauncher.datadir_missing=Tor 데이터 디렉토리가 존재하지 
않으며 생성할 수 없습니다.
 torlauncher.password_hash_missing=해쉬 암호 획득 실패
 
 torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S
@@ -37,7 +37,7 @@ torlauncher.quit_win=종료
 torlauncher.done=완료
 
 torlauncher.forAssistance=지원자 연결 %S
-torlauncher.forAssistance2=For assistance, visit %S
+torlauncher.forAssistance2=도움이 필요하면 %S를 방문하십시오.
 
 torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 í…
ìŠ¤íŠ¸ 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 
됩니다.
 

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

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

[translation]

commit e6ace5945801a8e4d6c3abdf3afd47fd8fec074c
Author: Translation commit bot 
Date:   Sat Jul 15 05:46:07 2017 +

Update translations for tor-launcher-properties_completed
---
 ko/torlauncher.properties | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ko/torlauncher.properties b/ko/torlauncher.properties
index c20a6ac..7f21eb0 100644
--- a/ko/torlauncher.properties
+++ b/ko/torlauncher.properties
@@ -1,8 +1,9 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor 브라우저 Launcher
 
+torlauncher.tor_exited_during_startup=시작하는 동안 Tor가 종
료되었습니다. 이것은 torrc 파일의 오류, Tor 또는 시스템의 
다른 프로그램의 버그 또는 하드웨어 결함으로 인한 것일 
수 있습니다. 기본 문제를 해결하고 Tor를 다시 시작할 
때까지 Tor 브라우저는 시작되지 않습니다.
 torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. 
이것은 Tor 자체의 오류, 사용자 시스템의 타 프로그램 또는 
하드웨어의 오류 때문일 수 있습니다. 사용자가 Tor를 
재시작 하기 전까진, Tor 브라우저는 어떠한 웹사이트에 ì 
‘속하지 않습니다. 문제가 계속된다면, 지원팀에게 당신의 
Tor 로그를 보내주십시오.
 torlauncher.tor_exited2=Tor를 재시작해도 브라우저 탭은 닫히지 
않음.
 torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어ë 
µìŠµë‹ˆë‹¤.
@@ -13,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S)
 
 torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S
 torlauncher.tor_missing=Tor 실행 파일이 없습니다.
-torlauncher.torrc_missing=torrc 파일이 없습니다.
-torlauncher.datadir_missing=Tor 데이터 목록이 존재하지 않습니다.
+torlauncher.torrc_missing=torrc 파일이 사라졌으며 생성 할 수 
없습니다.
+torlauncher.datadir_missing=Tor 데이터 디렉토리가 존재하지 
않으며 생성할 수 없습니다.
 torlauncher.password_hash_missing=해쉬 암호 획득 실패
 
 torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S
@@ -36,6 +37,7 @@ torlauncher.quit_win=종료
 torlauncher.done=완료
 
 torlauncher.forAssistance=지원자 연결 %S
+torlauncher.forAssistance2=도움이 필요하면 %S를 방문하십시오.
 
 torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 í…
ìŠ¤íŠ¸ 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 
됩니다.
 
@@ -52,7 +54,7 @@ torlauncher.bootstrapStatus.done=Tor 네트워크에 연결 
성공!
 
 torlauncher.bootstrapWarning.done=완료
 torlauncher.bootstrapWarning.connectrefused=연결이 거부됨
-torlauncher.bootstrapWarning.misc=잡동사니
+torlauncher.bootstrapWarning.misc=기타
 torlauncher.bootstrapWarning.resourcelimit=리소스 부족
 torlauncher.bootstrapWarning.identity=계정 불일치
 torlauncher.bootstrapWarning.timeout=연결 타임아웃

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

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

[translation]

commit 38674eaa5d7c477e1f96d5295d0a6c0313b9a573
Author: Translation commit bot 
Date:   Sat Jul 15 05:45:43 2017 +

Update translations for tails-greeter
---
 ko/ko.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ko/ko.po b/ko/ko.po
index 2f0fcc0..38d6069 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 08:28+0200\n"
-"PO-Revision-Date: 2017-06-10 10:19+\n"
+"POT-Creation-Date: 2017-06-10 12:27+0200\n"
+"PO-Revision-Date: 2017-07-15 05:33+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -254,7 +254,7 @@ msgstr ""
 
 #: ../tailsgreeter/gui.py:602
 msgid "Cancel"
-msgstr ""
+msgstr "취소"
 
 #: ../tailsgreeter/gui.py:608
 msgid "Add"

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

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

[translation]

commit 0815d40887141485af91834dab2113631fbfc25e
Author: Translation commit bot 
Date:   Sat Jul 15 05:45:14 2017 +

Update translations for whisperback
---
 ko/ko.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ko/ko.po b/ko/ko.po
index 5dfcb4c..ea2176b 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -3,17 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# snotree , 2017
 # cwt96 , 2012
 # Johnny Cho , 2013
 # sleepinium , 2013
-# pCsOrI , 2012
+# 이피시소리 , 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-03-21 08:24+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-07-15 05:26+\n"
+"Last-Translator: snotree \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,19 +46,19 @@ msgstr "변수 %s 를 설정 
파일(/etc/whisperback/config.py, ~/.whisperback/c
 
 #: ../whisperBack/gui.py:110
 msgid "Name of the affected software"
-msgstr ""
+msgstr "영향을 받는 소프트웨어의 이름"
 
 #: ../whisperBack/gui.py:112
 msgid "Exact steps to reproduce the error"
-msgstr ""
+msgstr "문제를 재현하기 위한 정확한 단계"
 
 #: ../whisperBack/gui.py:114
 msgid "Actual result and description of the error"
-msgstr ""
+msgstr "오류의 실제 결과 및 설명"
 
 #: ../whisperBack/gui.py:116
 msgid "Desired result"
-msgstr ""
+msgstr "원하는 결과"
 
 #: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."

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

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

[translation]

commit 5a6ed410c39987c25332d5c334b2ca7975deda72
Author: Translation commit bot 
Date:   Sat Jul 15 05:45:18 2017 +

Update translations for whisperback_completed
---
 ko/ko.po | 63 ---
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/ko/ko.po b/ko/ko.po
index a5164a0..ea2176b 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -3,17 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# snotree , 2017
 # cwt96 , 2012
 # Johnny Cho , 2013
 # sleepinium , 2013
-# pCsOrI , 2012
+# 이피시소리 , 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 19:54+0100\n"
-"PO-Revision-Date: 2016-03-21 16:28+\n"
-"Last-Translator: Johnny Cho \n"
+"POT-Creation-Date: 2017-03-20 12:09+\n"
+"PO-Revision-Date: 2017-07-15 05:26+\n"
+"Last-Translator: snotree \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,40 +44,56 @@ msgid ""
 "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 msgstr "변수 %s 를 설정 파일(/etc/whisperback/config.py, 
~/.whisperback/config.py, ./config.py)에서 찾을 수 없습니다."
 
-#: ../whisperBack/gui.py:148
+#: ../whisperBack/gui.py:110
+msgid "Name of the affected software"
+msgstr "영향을 받는 소프트웨어의 이름"
+
+#: ../whisperBack/gui.py:112
+msgid "Exact steps to reproduce the error"
+msgstr "문제를 재현하기 위한 정확한 단계"
+
+#: ../whisperBack/gui.py:114
+msgid "Actual result and description of the error"
+msgstr "오류의 실제 결과 및 설명"
+
+#: ../whisperBack/gui.py:116
+msgid "Desired result"
+msgstr "원하는 결과"
+
+#: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."
 msgstr "올바른 설정을 불러올 수 없습니다."
 
-#: ../whisperBack/gui.py:214
+#: ../whisperBack/gui.py:218
 msgid "Sending mail..."
 msgstr "메일 전송 중..."
 
-#: ../whisperBack/gui.py:215
+#: ../whisperBack/gui.py:219
 msgid "Sending mail"
 msgstr "메일 전송 중"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:217
+#: ../whisperBack/gui.py:221
 msgid "This could take a while..."
 msgstr "다소 시간이 걸릴 수 있습니다..."
 
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:236
 msgid "The contact email adress doesn't seem valid."
 msgstr "연락처 이메일 주소가 올바르지 않습니다."
 
-#: ../whisperBack/gui.py:249
+#: ../whisperBack/gui.py:253
 msgid "Unable to send the mail: SMTP error."
 msgstr "메일을 보낼 수 없습니다: SMPT 오류."
 
-#: ../whisperBack/gui.py:251
+#: ../whisperBack/gui.py:255
 msgid "Unable to connect to the server."
 msgstr "서버에 연결할 수 없습니다."
 
-#: ../whisperBack/gui.py:253
+#: ../whisperBack/gui.py:257
 msgid "Unable to create or to send the mail."
 msgstr "메일을 작성하거나 보낼 수 없습니다."
 
-#: ../whisperBack/gui.py:256
+#: ../whisperBack/gui.py:260
 msgid ""
 "\n"
 "\n"
@@ -85,20 +102,20 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\n네트워크 문제로 인해 버그 보고서를 보낼 수 
없을 가능성이 있습니다. 네트워크를 다시 연결하고 다시 
보내기를 시도하여 보십시오.\n\n작동하지 않는 경우, 버그 
보고서를 저장하십시오.  "
 
-#: ../whisperBack/gui.py:269
+#: ../whisperBack/gui.py:273
 msgid "Your message has been sent."
 msgstr "메시지를 보냈습니다."
 
-#: ../whisperBack/gui.py:276
+#: ../whisperBack/gui.py:280
 msgid "An error occured during encryption."
 msgstr "암호화하는 동안 오류가 발생했습니다."
 
-#: ../whisperBack/gui.py:296
+#: ../whisperBack/gui.py:300
 #, python-format
 msgid "Unable to save %s."
 msgstr "%s을(를) 저장할 수 없습니다."
 
-#: ../whisperBack/gui.py:319
+#: ../whisperBack/gui.py:323
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -108,27 +125,27 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "네트워크 문제로 인해 버그 보고서를 보낼 수 없을 
가능성이 있습니다.\n\n버그 보고서를 파일로 USB 드라이브에 
저장하여 다른 시스템을 사용하여 %s를 우리에게 보낼 수 
있습니다. 참고: 추가 단계를 취하지 않으면 귀하의 버그 
보고서는 익명으로 처리되지 않습니다.\n(예, 이메일 계ì 
•ìœ¼ë¡œ 토르를 사용하지 않는 경우)\n\n버그 보고서를 파일로 
저장하시겠습니까?"
 
-#: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21
+#: ../whisperBack/gui.py:383 

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

[translation]

commit 330d8f5ca293c863dbc4204d6af48622aebf7a7e
Author: Translation commit bot 
Date:   Sat Jul 15 05:18:26 2017 +

Update translations for exoneratorproperties
---
 ko/exonerator.properties | 60 
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/ko/exonerator.properties b/ko/exonerator.properties
index 0797efe..e11a40d 100644
--- a/ko/exonerator.properties
+++ b/ko/exonerator.properties
@@ -1,16 +1,16 @@
-form.explanation=Enter an IP address and date to find out whether that address 
was used as a Tor relay\:
-form.ip.label=IP address
-form.timestamp.label=Date
+form.explanation=IP 주소와 날짜를 입력하여 해당 주소가 Tor 릴ë 
ˆì´ë¡œ 사용되었는지 확인하십시오.
+form.ip.label=IP 주소
+form.timestamp.label=날짜
 form.search.label=검색
 summary.heading=요약
-summary.serverproblem.dbnoconnect.title=Server problem
-summary.serverproblem.dbnoconnect.body.text=Unable to connect to the database. 
Please try again later. If this problem persists, please %s\!
-summary.serverproblem.dbnoconnect.body.link=let us know
-summary.serverproblem.dbempty.title=Server problem
-summary.serverproblem.dbempty.body.text=The database appears to be empty. 
Please try again later. If this problem persists, please %s\!
-summary.serverproblem.dbempty.body.link=let us know
-summary.invalidparams.notimestamp.title=No date parameter given
-summary.invalidparams.notimestamp.body=Sorry, you also need to provide a date 
parameter.
+summary.serverproblem.dbnoconnect.title=서버 문제
+summary.serverproblem.dbnoconnect.body.text=데이터베이스에 연결할 
수 없습니다. 나중에 다시 시도 해주십시오. 이 문제가 
계속되면 %s을 하시기 바랍니다!
+summary.serverproblem.dbnoconnect.body.link=저희에게 알려주세요
+summary.serverproblem.dbempty.title=서버 문제
+summary.serverproblem.dbempty.body.text=데이터베이스가 비어있는 것 
같습니다. 나중에 다시 시도 해주십시오. 이 문제가 
계속되면 %s을 하시기 바랍니다!
+summary.serverproblem.dbempty.body.link=저희에게 알려주세요
+summary.invalidparams.notimestamp.title=날짜 매개 변수가 지정되지 
않음
+summary.invalidparams.notimestamp.body=죄송합니다. 날짜 매개 
변수도 입력 해야 합니다.
 summary.invalidparams.noip.title=No IP address parameter given
 summary.invalidparams.noip.body=Sorry, you also need to provide an IP address 
parameter.
 summary.invalidparams.timestamprange.title=Date parameter out of range
@@ -19,36 +19,36 @@ summary.invalidparams.invalidip.title=Invalid IP address 
parameter
 summary.invalidparams.invalidip.body=Sorry, %s is not a valid IP address. The 
expected IP address formats are %s or %s.
 summary.invalidparams.invalidtimestamp.title=Invalid date parameter
 summary.invalidparams.invalidtimestamp.body=Sorry, %s is not a valid date. The 
expected date format is %s.
-summary.serverproblem.nodata.title=Server problem
-summary.serverproblem.nodata.body.text=The database does not contain any data 
for the requested date. Please try again later. If this problem persists, 
please %s\!
-summary.serverproblem.nodata.body.link=let us know
+summary.serverproblem.nodata.title=서버 문제
+summary.serverproblem.nodata.body.text=The database does not contain any data 
for the requested date. Please try again later. If this problem persists, 
please %s!
+summary.serverproblem.nodata.body.link=저희에게 알려주세요
 summary.negativesamenetwork.title=Result is negative
-summary.negativesamenetwork.body=We did not find IP address %s on or within a 
day of %s. But we did find other IP addresses of Tor relays in the same /%d 
network around the time\:
+summary.negativesamenetwork.body=We did not find IP address %s on or within a 
day of %s. But we did find other IP addresses of Tor relays in the same /%d 
network around the time:
 summary.positive.title=Result is positive
 summary.positive.body=We found one or more Tor relays on IP address %s on or 
within a day of %s that Tor clients were likely to know.
 summary.negative.title=Result is negative
 summary.negative.body=We did not find IP address %s on or within a day of %s.
 technicaldetails.heading=Technical details
 technicaldetails.pre=Looking up IP address %s on or within one day of %s. Tor 
clients could have selected this or these Tor relays to build circuits.
-technicaldetails.colheader.timestamp=Timestamp (UTC)
-technicaldetails.colheader.ip=IP address(es)
-technicaldetails.colheader.fingerprint=Identity fingerprint
+technicaldetails.colheader.timestamp=타임 스탬프 (UTC)
+technicaldetails.colheader.ip=IP 주소
+technicaldetails.colheader.fingerprint=신원 지문
 technicaldetails.colheader.nickname=별명
-technicaldetails.colheader.exit=Exit relay
+technicaldetails.colheader.exit=중계 종료
 technicaldetails.nickname.unknown=알 수 없음
 

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

[translation]

commit a74f62af68b438318b57a8bf3e6537b6a3d0e29e
Author: Translation commit bot 
Date:   Sat Jul 15 05:15:15 2017 +

Update translations for torcheck_completed
---
 ko/torcheck.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko/torcheck.po b/ko/torcheck.po
index 96cbf88..e0408ed 100644
--- a/ko/torcheck.po
+++ b/ko/torcheck.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"PO-Revision-Date: 2017-07-15 05:02+\n"
 "Last-Translator: sangmin lee \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"

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

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

[translation]

commit 40cb4f553d1f5b5c5dc5f9f0e41a7a262f555a8a
Author: Translation commit bot 
Date:   Sat Jul 15 05:15:10 2017 +

Update translations for torcheck
---
 ko/torcheck.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ko/torcheck.po b/ko/torcheck.po
index 96cbf88..e0408ed 100644
--- a/ko/torcheck.po
+++ b/ko/torcheck.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"PO-Revision-Date: 2017-07-15 05:02+\n"
 "Last-Translator: sangmin lee \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [snowflake/master] Have the broker log in UTC.

[dcf]

commit 2242be7a5580cbafed9ccd35004e95213207e509
Author: David Fifield 
Date:   Fri Jul 14 20:07:50 2017 -0700

Have the broker log in UTC.
---
 broker/broker.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/broker/broker.go b/broker/broker.go
index 1673601..d969ce5 100644
--- a/broker/broker.go
+++ b/broker/broker.go
@@ -227,6 +227,8 @@ func ipHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func init() {
+   log.SetFlags(log.LstdFlags | log.LUTC)
+
ctx := NewBrokerContext()
 
go ctx.Broker()

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

[tor-commits] [snowflake/master] Use https links for keroserene.net.

[dcf]

commit f2ee53e42ed9c81688ee9dc8c5fb395eb1e3f59c
Author: David Fifield 
Date:   Fri Jul 14 18:36:44 2017 -0700

Use https links for keroserene.net.
---
 proxy/README.md | 4 ++--
 proxy/static/index.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/proxy/README.md b/proxy/README.md
index 4686783..2a0f7ea 100644
--- a/proxy/README.md
+++ b/proxy/README.md
@@ -2,9 +2,9 @@ This is the browser proxy component of Snowflake.
 
 ### Embedding
 
-See [keroserene.net/snowflake](http://keroserene.net/snowflake) for more info:
+See [keroserene.net/snowflake](https://keroserene.net/snowflake) for more info:
 ```
-http://keroserene.net/snowflake/embed.html; width="88" 
height="16" frameborder="0" scrolling="no">
+https://keroserene.net/snowflake/embed.html; width="88" 
height="16" frameborder="0" scrolling="no">
 ```
 
 ### Testing
diff --git a/proxy/static/index.html b/proxy/static/index.html
index 895f67d..f0beced 100644
--- a/proxy/static/index.html
+++ b/proxy/static/index.html
@@ -52,13 +52,13 @@ It is now possible to embed the Snowflake badge on any 
website:
 
 
 
-http://keroserene.net/snowflake/embed.html; width="88" 
height="16" frameborder="0" scrolling="no">
+https://keroserene.net/snowflake/embed.html; width="88" 
height="16" frameborder="0" scrolling="no">
 
 
 
 Which looks like this:
 
-http://keroserene.net/snowflake/embed.html; width="88" 
height="16" frameborder="0" scrolling="no">
+https://keroserene.net/snowflake/embed.html; width="88" 
height="16" frameborder="0" scrolling="no">
 
 
 If it animates, then congratulations -- you are currently acting as a Tor 
bridge.

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

[tor-commits] [webwml/master] Add Taylor

[atagar]

commit 9128bd80b4c16e91e1b0cc2892d2abfea99a0bc6
Author: Damian Johnson 
Date:   Fri Jul 14 14:35:31 2017 -0700

Add Taylor
---
 about/en/corepeople_alternate.wml | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/about/en/corepeople_alternate.wml 
b/about/en/corepeople_alternate.wml
index 6f6b244..63004ad 100644
--- a/about/en/corepeople_alternate.wml
+++ b/about/en/corepeople_alternate.wml
@@ -660,6 +660,18 @@ table.people tr td:first-child {
 
 
 
+  
+  
+  https://twitter.com/argonblue;>
+  https://db.torproject.org/fetchkey.cgi?fingerprint=2C732B1C0DBEF678AB3AF606A32F17FD0055C305;>
+  Taylor Yu
+  IRC: catalyst
+  Software archaeologist and keeper of C language 
arcana. Works with applied cryptography, protocol design, software security, 
and technical debt restructuring.
+
+  
+
+  
+
   
   
   https://db.torproject.org/fetchkey.cgi?fingerprint=C8556CED5D90A0C529F64D43450CBA7F968F094B;>
@@ -667,9 +679,7 @@ table.people tr td:first-child {
   IRC: teor
   Onion services developer, and core member of 
Tor dev team. Researches Tor network measurement and onion service 
scalability.
 
-  
 
-  
 
   
   
@@ -679,7 +689,9 @@ table.people tr td:first-child {
   IRC: tjr
   Maintains https://consensus-health.torproject.org/;>Consensus Health , runs one 
of the bandwidth authorities, and contributes to Tor Browser.
 
+  
 
+  
 
   
   
@@ -688,9 +700,6 @@ table.people tr td:first-child {
   IRC: t0mmy
   Writes and edits grant proposals, one-pagers, 
blogposts, etc.
 
-  
-
-  
 
   
   

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

[tor-commits] [stem/master] Ensure port used by process tests is unused

[atagar]

commit d37810010f4f587dbb848e9ac69ab9f9472e47dd
Author: Damian Johnson 
Date:   Fri Jul 14 12:40:47 2017 -0700

Ensure port used by process tests is unused

When running in a loop catalyst occasionally runs into...

  OSError: Process terminated: Failed to bind one of the listener ports.
  https://trac.torproject.org/projects/tor/ticket/22902

First guess is that maybe multiple tests pick the same random port, or
something that's coincidently being used by the system. Tried to use 
socket's
connect_ex() for this...

  
https://stackoverflow.com/questions/19196105/python-how-to-check-if-a-network-port-is-open-on-linux

But doing so causes exactly the binding failures we're attempting to avoid
(even with a sleep after closing). Weird. Just checking for process instead.
---
 test/integ/process.py | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/integ/process.py b/test/integ/process.py
index 70f414c..dea0b4c 100644
--- a/test/integ/process.py
+++ b/test/integ/process.py
@@ -2,6 +2,8 @@
 Tests the stem.process functions with various use cases.
 """
 
+from __future__ import absolute_import
+
 import binascii
 import hashlib
 import os
@@ -45,7 +47,11 @@ DataDirectory %s
 
 
 def random_port():
-  return str(random.randint(1024, 65535))
+  while True:
+port = random.randint(1024, 65535)
+
+if stem.util.system.pid_by_port(port) is None:
+  return str(port)
 
 
 @contextmanager
@@ -552,8 +558,8 @@ class TestProcess(unittest.TestCase):
   except OSError:
 runtime = time.time() - start_time
 
-if not (runtime > 0.05 and runtime < 1):
-  raise AssertionError('Test should have taken 0.05-1 seconds, took 
%0.1f instead' % runtime)
+if not (runtime > 0.05 and runtime < 3):
+  raise AssertionError('Test should have taken 0.05-3 seconds, took 
%0.1f instead' % runtime)
 
   @asynchronous
   def test_take_ownership_via_pid(tor_cmd):

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

[tor-commits] [webwml/master] Add Sina

[atagar]

commit 454fed2db86a288bb44e82d48f3d9643c671e824
Author: Damian Johnson 
Date:   Fri Jul 14 13:40:22 2017 -0700

Add Sina
---
 about/en/corepeople_alternate.wml |  24 ++--
 images/people/inf0.png| Bin 0 -> 18667 bytes
 images/people/orig/inf0.jpg   | Bin 0 -> 21090 bytes
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/about/en/corepeople_alternate.wml 
b/about/en/corepeople_alternate.wml
index a8c4361..6f6b244 100644
--- a/about/en/corepeople_alternate.wml
+++ b/about/en/corepeople_alternate.wml
@@ -617,6 +617,18 @@ table.people tr td:first-child {
 
 
 
+  
+  
+  https://twitter.com/wwwiretap;>
+  https://s3.amazonaws.com/sina-publickeys/0B47D56D.asc;>
+  Sina Rabbani
+  IRC: inf0
+  Directory authority operator, outreach and 
trains human rights activists. System's Engineer at Team Cymru and co-Founder 
of accessnow.org.
+
+  
+
+  
+
   
   
   https://twitter.com/walnutwordsalad;>
@@ -625,9 +637,7 @@ table.people tr td:first-child {
   IRC: stephw
   Directs communications to consistently 
articulate and promote the Tor Project's mission.
 
-  
 
-  
 
   
   
@@ -637,7 +647,9 @@ table.people tr td:first-child {
   IRC: sjmurdoch
   http://www.cs.ucl.ac.uk/staff/s.murdoch/;>Principal Research Fellow 
at University College London and original creator of the https://www.torproject.org/projects/torbrowser.html.en;>Tor 
Browser.
 
+  
 
+  
 
   
   
@@ -646,9 +658,7 @@ table.people tr td:first-child {
   IRC: sukhe
   https://trac.torproject.org/projects/tor/wiki/torbirdy;>TorBirdy and 
https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger;>Tor 
Messenger developer. Volunteer on the https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam;>Community
 Team.
 
-  
 
-  
 
   
   
@@ -657,7 +667,9 @@ table.people tr td:first-child {
   IRC: teor
   Onion services developer, and core member of 
Tor dev team. Researches Tor network measurement and onion service 
scalability.
 
+  
 
+  
 
   
   
@@ -667,9 +679,7 @@ table.people tr td:first-child {
   IRC: tjr
   Maintains https://consensus-health.torproject.org/;>Consensus Health , runs one 
of the bandwidth authorities, and contributes to Tor Browser.
 
-  
 
-  
 
   
   
@@ -678,7 +688,9 @@ table.people tr td:first-child {
   IRC: t0mmy
   Writes and edits grant proposals, one-pagers, 
blogposts, etc.
 
+  
 
+  
 
   
   
diff --git a/images/people/inf0.png b/images/people/inf0.png
new file mode 100644
index 000..5b8fc9c
Binary files /dev/null and b/images/people/inf0.png differ
diff --git a/images/people/orig/inf0.jpg b/images/people/orig/inf0.jpg
new file mode 100644
index 000..cbd6032
Binary files /dev/null and b/images/people/orig/inf0.jpg differ

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

[tor-commits] [tor/master] Merge branch 'bug17750_029_squashed'

[nickm]

commit 0ccdf2f31e52bde1dc9556a4c938c494e784c79c
Merge: 9a1338d b7566d4
Author: Nick Mathewson 
Date:   Fri Jul 14 15:07:09 2017 -0400

Merge branch 'bug17750_029_squashed'

 changes/bug22924| 4 
 src/test/test_dir.c | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] Fix a signed integer overflow in dir/download_status_random_backoff

[nickm]

commit b7566d465f0299e97b46f40d746a1203257245d4
Author: Nick Mathewson 
Date:   Fri Jul 14 13:56:40 2017 -0400

Fix a signed integer overflow in dir/download_status_random_backoff

Fix for 22924. Bugfix on 0.2.9.1-alpha when the test was introducd
-- though it couldn't actually overflow until we fixed 17750.

Additionally, this only seems to overflow on 32-bit, and only when
the compiler doesn't re-order the (possibly dead) assignment out of
the way.  We ran into it on a 32-bit ubuntu trusty builder.
---
 changes/bug22924| 4 
 src/test/test_dir.c | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug22924 b/changes/bug22924
new file mode 100644
index 000..e59fc72
--- /dev/null
+++ b/changes/bug22924
@@ -0,0 +1,4 @@
+  o Minor bugfies (tests):
+- Fix a signed-integer overflow in the unit tests for
+  dir/download_status_random_backoff, which was untriggered until we
+  fixed bug 17750.  Fixes bug 22924; bugfix on 0.2.9.1-alpha.
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 53911e8..729ae64 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -3657,12 +3657,14 @@ download_status_random_backoff_helper(int min_delay, 
int max_delay)
 }
 
 /* Advance */
-current_time += increment;
 ++(dls_random.n_download_attempts);
 ++(dls_random.n_download_failures);
 
 /* Try another maybe */
 old_increment = increment;
+if (increment >= max_delay)
+  current_time += increment;
+
   } while (increment < max_delay);
 
  done:



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

[tor-commits] [webwml/master] Add iwakeh's key

[atagar]

commit 270e16da096c699f0b781030fae5f361f93e
Author: Damian Johnson 
Date:   Fri Jul 14 11:24:40 2017 -0700

Add iwakeh's key

Received permission to link to their key.
---
 about/en/corepeople_alternate.wml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/about/en/corepeople_alternate.wml 
b/about/en/corepeople_alternate.wml
index 2936a7c..a8c4361 100644
--- a/about/en/corepeople_alternate.wml
+++ b/about/en/corepeople_alternate.wml
@@ -307,6 +307,7 @@ table.people tr td:first-child {
 
   
   
+  https://db.torproject.org/fetchkey.cgi?fingerprint=B788B36768B69B4DD8E1F69E75256C22E303259C;>
   iwakeh
   Speaks Java and other languages, streamlines 
build processes, and scrutinizes mathematical concepts behind aggregating tons 
of Tor network data.
 

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

[tor-commits] [sandboxed-tor-browser/master] Bug 22899: Force disable the "Get Addons" pane via a pref.

[yawning]

commit 7da173ec3f91a88a4470b07cffc1b102f7e00f4a
Author: Yawning Angel 
Date:   Fri Jul 14 16:45:09 2017 +

Bug 22899: Force disable the "Get Addons" pane via a pref.

This seems to be the solution that the Tor Browser devs are going for,
which is sensible.
---
 data/installer/mozilla.cfg | 4 
 1 file changed, 4 insertions(+)

diff --git a/data/installer/mozilla.cfg b/data/installer/mozilla.cfg
index 7139e68..3aeed7a 100644
--- a/data/installer/mozilla.cfg
+++ b/data/installer/mozilla.cfg
@@ -25,3 +25,7 @@ lockPref("toolkit.startup.max_resumed_crashes", -1);
 // Set the security slider to "High" by default, if the fucking `defaultPref`
 // directive worked as advertised.  But it doesn't appear to actually take.
 // defaultPref("extensions.torbutton.security_slider", 1);
+
+// Disable the `about:addons`->"Get Addons" pane because it is unsafe, and
+// Mozilla gets "telemetery" using Google Analytics.
+lockPref("extensions.getAddons.showPane", false);



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

[tor-commits] [sandboxed-tor-browser/master] Bug 22910: Deprecate the volatile extension dir option.

[yawning]

commit 701c0656be16440203147eb0ea6104486bb77096
Author: Yawning Angel 
Date:   Fri Jul 14 17:18:24 2017 +

Bug 22910: Deprecate the volatile extension dir option.

Foot + gun options are bad, the "Get Addons" pane is force disabled via
a locked pref by virtue of being Mozilla + Google botnet bullshit, and
this commit also switches to an extension whitelist.
---
 ChangeLog  |  1 +
 README.md  |  2 +-
 data/installer/mozilla.cfg |  5 +--
 data/ui/gtkui.ui   | 42 ++
 .../internal/sandbox/application.go| 22 +---
 .../internal/sandbox/hugbox.go |  4 +++
 .../internal/tor/surrogate.go  | 16 -
 .../internal/ui/config/config.go   | 14 
 .../internal/ui/gtk/config.go  | 25 ++---
 9 files changed, 39 insertions(+), 92 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c281169..2d7ee1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Changes in version 0.0.11 - UNRELEASED:
+ * Bug 22910: Deprecate the volatile extension dir option.
 
 Changes in version 0.0.10 - 2017-07-12:
  * Bug 22829: Remove default obfs4 bridge riemann.
diff --git a/README.md b/README.md
index 6cad572..f5013d0 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Things that the sandbox breaks:
  * Audio (Unless allowed via the config)
  * DRI
  * X11 input methods (IBus requires access to the host D-Bus)
- * Installing addons via the browser UI (Unless allowed via the config)
+ * Installing addons (Addons are whitelisted)
  * Tor Browser's updater (launcher handles keeping the bundle up to date)
 
 Places where the sandbox could be better:
diff --git a/data/installer/mozilla.cfg b/data/installer/mozilla.cfg
index 3aeed7a..64f0e60 100644
--- a/data/installer/mozilla.cfg
+++ b/data/installer/mozilla.cfg
@@ -26,6 +26,7 @@ lockPref("toolkit.startup.max_resumed_crashes", -1);
 // directive worked as advertised.  But it doesn't appear to actually take.
 // defaultPref("extensions.torbutton.security_slider", 1);
 
-// Disable the `about:addons`->"Get Addons" pane because it is unsafe, and
-// Mozilla gets "telemetery" using Google Analytics.
+// Disable the `about:addons`->"Get Addons" pane because it is unsafe,  Mozilla
+// gets "telemetery" using Google Analytics, and extensions are individually
+// read-only bind mounted in, so it will not work at all.
 lockPref("extensions.getAddons.showPane", false);
diff --git a/data/ui/gtkui.ui b/data/ui/gtkui.ui
index c6cefb7..728fccb 100644
--- a/data/ui/gtkui.ui
+++ b/data/ui/gtkui.ui
@@ -628,42 +628,6 @@
   
 
 
-  
-True
-False
-6
-
-  
-True
-False
-start
-Modifiable 
Extensions (UNSAFE: Security, Anonymity)
-  
-  
-True
-True
-0
-  
-
-
-  
-True
-True
-  
-  
-False
-True
-1
-  
-
-  
-  
-False
-True
-3
-  
-
-
   
 True
 False
@@ -698,7 +662,7 @@
   
 False
 True
-4
+3
   
 
 
@@ -736,7 +700,7 @@
   
 False
 True
-5
+4
   
 
 
@@ -773,7 +737,7 @@
   
 False
 True
-6
+5
   
 
   
diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go 
b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go
index 969c6af..4057b21 100644
--- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go
+++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go
@@ -102,6 +102,7 @@ func RunTorBrowser(cfg *config.Config, manif 
*config.Manifest, tor *tor.Tor) (pr
realCachesDir := filepath.Join(realBrowserHome, cachesSubDir)
realDesktopDir := filepath.Join(realBrowserHome, 

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

[translation]

commit a5431f516bfb11f884d9004c082c42718608c88a
Author: Translation commit bot 
Date:   Fri Jul 14 17:18:30 2017 +

Update translations for exoneratorproperties
---
 pl/exonerator.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pl/exonerator.properties b/pl/exonerator.properties
index 69636d8..7cb14e1 100644
--- a/pl/exonerator.properties
+++ b/pl/exonerator.properties
@@ -1,13 +1,13 @@
-form.explanation=Podaj adres IP oraz date, aby sprawdzić, czy dany adres 
został użyty jako jako przekaźnik przeglądarki Tor\:
+form.explanation=Podaj adres IP oraz date, aby sprawdzić, czy dany adres 
został użyty jako jako przekaźnik przeglądarki Tor:
 form.ip.label=Adres IP
 form.timestamp.label=Data
 form.search.label=Szukaj
 summary.heading=Podsumowanie
 summary.serverproblem.dbnoconnect.title=Problem z serwerem
-summary.serverproblem.dbnoconnect.body.text=Nie można połączyć się z bazą
 danych. Spróbuj ponownie później. Jeśli problem się utrzymuje, prosimy 
%s\!
+summary.serverproblem.dbnoconnect.body.text=Nie można połączyć się z bazą
 danych. Spróbuj ponownie później. Jeśli problem się utrzymuje, prosimy %s!
 summary.serverproblem.dbnoconnect.body.link=powiadom nas
 summary.serverproblem.dbempty.title=Problem z serwerem
-summary.serverproblem.dbempty.body.text=Baza danych zdaje się być pusta. 
Spróbuj ponownie później. Jeśli problem się pojawia się ponownie, prosimy 
%s\!
+summary.serverproblem.dbempty.body.text=Baza danych zdaje się być pusta. 
Spróbuj ponownie później. Jeśli problem się pojawia się ponownie, prosimy 
%s!
 summary.serverproblem.dbempty.body.link=powiadom nas
 summary.invalidparams.notimestamp.title=Brak daty
 summary.invalidparams.notimestamp.body=Przepraszamy, musisz podać datę.
@@ -20,10 +20,10 @@ summary.invalidparams.invalidip.body=Przepraszamy, adres IP 
%s jest błędny. Pr
 summary.invalidparams.invalidtimestamp.title=Niewłaściwa data
 summary.invalidparams.invalidtimestamp.body=Przepraszamy, data %s jest 
błędna. Prawidłowy format daty to %s.
 summary.serverproblem.nodata.title=Problem z serwerem
-summary.serverproblem.nodata.body.text=Baza danych nie zawiera informacji z 
wybranego dnia. Spróbuj ponownie później. Jeśli problem się utrzymuje, 
prosimy %s\!
+summary.serverproblem.nodata.body.text=Baza danych nie zawiera informacji z 
wybranego dnia. Spróbuj ponownie później. Jeśli problem się utrzymuje, 
prosimy %s!
 summary.serverproblem.nodata.body.link=powiadom nas
 summary.negativesamenetwork.title=Brak wyników
-summary.negativesamenetwork.body=Nie odnaleziono adresu IP %s z przedziału do 
24 godzin od %s, choć odnaleziono inne adresy IP będące przekaźnikami 
przeglądarki Tor w tej samej sieci /%d około tego przedziału\:
+summary.negativesamenetwork.body=Nie odnaleziono adresu IP %s z przedziału do 
24 godzin od %s, choć odnaleziono inne adresy IP będące przekaźnikami 
przeglądarki Tor w tej samej sieci /%d około tego przedziału:
 summary.positive.title=Wyniki
 summary.positive.body=Odnaleziono jeden lub więcej przekaźników przeglą
darki Tor pod adresem IP %s w przedziale do 24 godzin od %s, o których 
użytkownicy przeglądarki prawdopodobnie wiedzieli.
 summary.negative.title=Brak wyników
@@ -50,5 +50,5 @@ footer.aboutexonerator.body=The ExoneraTor service maintains 
a database of IP ad
 footer.trademark.text="Tor" i "Logo Onion" są %s Projektu Tor S.A.
 footer.trademark.link=Znaki towarowe.
 footer.language.name=English
-footer.language.text=This page is also available in the following languages\:
+footer.language.text=Ta strona jest także dostępna w poniższych językach:
 

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

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

[translation]

commit 0e113e4dc6164b59ab73cfee96b3a95191c2fe58
Author: Translation commit bot 
Date:   Fri Jul 14 17:15:47 2017 +

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

diff --git a/pl/pl.po b/pl/pl.po
index e2e8481..81df315 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -6,20 +6,21 @@
 # Aron , 2014
 # bogdrozd , 2013
 # Jakobus Buntownikus , 2016
+# No Ne, 2017
 # sebx, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-06-06 08:15+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
+"PO-Revision-Date: 2017-07-14 16:53+\n"
+"Last-Translator: No Ne\n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 
|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && 
(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && 
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:48
 msgid "Personal Data"
@@ -54,12 +55,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Zestaw kluczy OTR i profile Pidgina"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Profile Icedove oraz lokalnie trzymana poczta"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Profile Thunderbirda oraz lokalnie trzymana poczta"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"

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

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

[translation]

commit 760811eaa9573107fd332f326b0199e3cc59cbf2
Author: Translation commit bot 
Date:   Fri Jul 14 17:15:11 2017 +

Update translations for torcheck
---
 pl/torcheck.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pl/torcheck.po b/pl/torcheck.po
index df7fc11..40e8058 100644
--- a/pl/torcheck.po
+++ b/pl/torcheck.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"PO-Revision-Date: 2017-07-14 16:54+\n"
 "Last-Translator: sebx\n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 
|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && 
(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && 
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 msgid "Congratulations. This browser is configured to use Tor."
 msgstr "Gratulacje. Twoja przeglądarka jest skonfigurowana tak, by używała 
Tora."

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

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

[translation]

commit 6c825031d962c0d6b85bc2a2c125db51ac4112ed
Author: Translation commit bot 
Date:   Fri Jul 14 17:15:43 2017 +

Update translations for tails-persistence-setup
---
 pl/pl.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pl/pl.po b/pl/pl.po
index 70b5d80..81df315 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -6,20 +6,21 @@
 # Aron , 2014
 # bogdrozd , 2013
 # Jakobus Buntownikus , 2016
+# No Ne, 2017
 # sebx, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2017-05-17 03:09+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-07-14 16:53+\n"
+"Last-Translator: No Ne\n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && 
(n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && 
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && 
(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && 
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:48
 msgid "Personal Data"
@@ -55,11 +56,11 @@ msgstr "Zestaw kluczy OTR i profile Pidgina"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
 msgid "Thunderbird profiles and locally stored email"
-msgstr ""
+msgstr "Profile Thunderbirda oraz lokalnie trzymana poczta"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"

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

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

[translation]

commit 98886f707ad68ed0fce8d40b9f4a3f4cd1890a03
Author: Translation commit bot 
Date:   Fri Jul 14 17:15:21 2017 +

Update translations for whisperback
---
 pl/pl.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pl/pl.po b/pl/pl.po
index da08cea..84d972e 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -7,19 +7,20 @@
 # bogdrozd , 2013
 # EJI , 2013
 # EJI , 2013
+# No Ne, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-03-21 08:24+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-07-14 17:00+\n"
+"Last-Translator: No Ne\n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && 
(n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && 
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && 
(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && 
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. XXX use a better exception
 #: ../whisperBack/whisperback.py:56
@@ -45,19 +46,19 @@ msgstr "Nie znaleziono zmiennej %s w żadnym pliku 
konfiguracyjnym /etc/whisperb
 
 #: ../whisperBack/gui.py:110
 msgid "Name of the affected software"
-msgstr ""
+msgstr "Nazwa oprogramowania, którego dotyczy problem"
 
 #: ../whisperBack/gui.py:112
 msgid "Exact steps to reproduce the error"
-msgstr ""
+msgstr "Dokładne kroki w celu odtworzenia błędu"
 
 #: ../whisperBack/gui.py:114
 msgid "Actual result and description of the error"
-msgstr ""
+msgstr "Rzeczywisty rezultat i opis błędu"
 
 #: ../whisperBack/gui.py:116
 msgid "Desired result"
-msgstr ""
+msgstr "Pożądany rezultat"
 
 #: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."

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

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

[translation]

commit e81967b7d25c6eb5d6b680f63a1d837ec60147e0
Author: Translation commit bot 
Date:   Fri Jul 14 17:15:17 2017 +

Update translations for torcheck_completed
---
 pl/torcheck.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pl/torcheck.po b/pl/torcheck.po
index df7fc11..40e8058 100644
--- a/pl/torcheck.po
+++ b/pl/torcheck.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"PO-Revision-Date: 2017-07-14 16:54+\n"
 "Last-Translator: sebx\n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 
|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && 
(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && 
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 msgid "Congratulations. This browser is configured to use Tor."
 msgstr "Gratulacje. Twoja przeglądarka jest skonfigurowana tak, by używała 
Tora."

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

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

[translation]

commit 6ebd66c678216b8d8b10b968ae7011d36889dcec
Author: Translation commit bot 
Date:   Fri Jul 14 17:15:25 2017 +

Update translations for whisperback_completed
---
 pl/pl.po | 63 ---
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/pl/pl.po b/pl/pl.po
index 792598c..84d972e 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -7,19 +7,20 @@
 # bogdrozd , 2013
 # EJI , 2013
 # EJI , 2013
+# No Ne, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 19:54+0100\n"
-"PO-Revision-Date: 2016-03-21 16:28+\n"
-"Last-Translator: Aron \n"
+"POT-Creation-Date: 2017-03-20 12:09+\n"
+"PO-Revision-Date: 2017-07-14 17:00+\n"
+"Last-Translator: No Ne\n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 
|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && 
(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && 
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. XXX use a better exception
 #: ../whisperBack/whisperback.py:56
@@ -43,40 +44,56 @@ msgid ""
 "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 msgstr "Nie znaleziono zmiennej %s w żadnym pliku konfiguracyjnym 
/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 
-#: ../whisperBack/gui.py:148
+#: ../whisperBack/gui.py:110
+msgid "Name of the affected software"
+msgstr "Nazwa oprogramowania, którego dotyczy problem"
+
+#: ../whisperBack/gui.py:112
+msgid "Exact steps to reproduce the error"
+msgstr "Dokładne kroki w celu odtworzenia błędu"
+
+#: ../whisperBack/gui.py:114
+msgid "Actual result and description of the error"
+msgstr "Rzeczywisty rezultat i opis błędu"
+
+#: ../whisperBack/gui.py:116
+msgid "Desired result"
+msgstr "Pożądany rezultat"
+
+#: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."
 msgstr "Nie udało się załadować działającej konfiguracji."
 
-#: ../whisperBack/gui.py:214
+#: ../whisperBack/gui.py:218
 msgid "Sending mail..."
 msgstr "Wysyłanie..."
 
-#: ../whisperBack/gui.py:215
+#: ../whisperBack/gui.py:219
 msgid "Sending mail"
 msgstr "Wysyłanie"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:217
+#: ../whisperBack/gui.py:221
 msgid "This could take a while..."
 msgstr "To może chwilę potrwać..."
 
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:236
 msgid "The contact email adress doesn't seem valid."
 msgstr "Adres email wygląda na błędny."
 
-#: ../whisperBack/gui.py:249
+#: ../whisperBack/gui.py:253
 msgid "Unable to send the mail: SMTP error."
 msgstr "Nie można wysłać poczty: błąd SMTP."
 
-#: ../whisperBack/gui.py:251
+#: ../whisperBack/gui.py:255
 msgid "Unable to connect to the server."
 msgstr "Nie można połączyć się z serwerem."
 
-#: ../whisperBack/gui.py:253
+#: ../whisperBack/gui.py:257
 msgid "Unable to create or to send the mail."
 msgstr "Nie można utworzyć lub wysłać poczty."
 
-#: ../whisperBack/gui.py:256
+#: ../whisperBack/gui.py:260
 msgid ""
 "\n"
 "\n"
@@ -85,20 +102,20 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nNie można wysłać zawiadomienia o błędzie, prawdopodobnie 
przez problemy z siecią. Postaraj sie połączyć z siecią ponownie i klikną
ć wyślij. \n\nJeżeli to nie zadziała, będziesz miał(a) mozliwość 
zachowania raportu o błędzie."
 
-#: ../whisperBack/gui.py:269
+#: ../whisperBack/gui.py:273
 msgid "Your message has been sent."
 msgstr "Wiadomość została wysłana."
 
-#: ../whisperBack/gui.py:276
+#: ../whisperBack/gui.py:280
 msgid "An error occured during encryption."
 msgstr "Wystąpił błąd podczas szyfrowania."
 
-#: ../whisperBack/gui.py:296
+#: ../whisperBack/gui.py:300
 #, python-format
 msgid "Unable to save %s."
 msgstr "Nie można zapisać %s."
 
-#: ../whisperBack/gui.py:319
+#: ../whisperBack/gui.py:323
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -108,27 +125,27 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "Nie można wysłać komunikatu o błędzie, prawdopodobnie ze względu 
na problemy z siecią.\n\nAby to obejść, możesz zapisać raport o błędzie 
jako plik na dysku USB i spróbować wysłać go z twojego konta email na %s 
używając innego systemu. Pamiętaj, że w ten sposób Twój raport nie 
będzie anonimowy, chyba że postarasz się aby był (na przykład używając 
Tor z jednorazowym kontem email).\n\nCzy chcesz zapisać raport błędu jako 

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

[translation]

commit 2b4a14981dfc40c18d5542c203bdb1d9b6805663
Author: Translation commit bot 
Date:   Fri Jul 14 16:15:30 2017 +

Update translations for liveusb-creator
---
 hu/hu.po | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/hu/hu.po b/hu/hu.po
index 808c1d9..a4f1a45 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -10,6 +10,7 @@
 # Gábor Ginál dr. , 2014
 # kane , 2013
 # Lajos Pasztor , 2014
+# PB , 2017
 # Sulyok Péter , 2009
 # vargaviktor , 2013
 # vargaviktor , 2012
@@ -17,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-09 17:50+0200\n"
-"PO-Revision-Date: 2017-06-10 01:55+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2017-06-30 13:14+0200\n"
+"PO-Revision-Date: 2017-07-14 16:11+\n"
+"Last-Translator: PB \n"
 "Language-Team: Hungarian 
(http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -200,7 +201,7 @@ msgstr "Bootloader telepítése..."
 #: ../tails_installer/creator.py:1016
 #, python-format
 msgid "Could not find the '%s' COM32 module"
-msgstr ""
+msgstr "A '%s' COM32 modul nem található."
 
 #: ../tails_installer/creator.py:1024 ../tails_installer/creator.py:1405
 #, python-format
@@ -311,7 +312,7 @@ msgstr "Telepítés kész! (%s)"
 
 #: ../tails_installer/gui.py:258
 msgid "Tails installation failed!"
-msgstr ""
+msgstr "A Tails telepítése sikertelen!"
 
 #: ../tails_installer/gui.py:353
 msgid ""
@@ -322,7 +323,7 @@ msgstr "Figyelem: Ennek az eszköznek Administrator 
jogosultsággal kell indulni
 
 #: ../tails_installer/gui.py:365 ../tails_installer/launcher.py:31
 msgid "Tails Installer"
-msgstr ""
+msgstr "Tails telepítő"
 
 #: ../tails_installer/gui.py:440
 msgid "No device suitable to install Tails could be found"
@@ -495,11 +496,11 @@ msgstr ""
 
 #: ../data/tails-installer.ui.h:2
 msgid "Select a distribution to download:"
-msgstr ""
+msgstr "Válassza ki a letöltendő disztribúciót:"
 
 #: ../data/tails-installer.ui.h:3
 msgid "Target Device:"
-msgstr ""
+msgstr "Céleszköz:"
 
 #: ../data/tails-installer.ui.h:4
 msgid "Install Tails"

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

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

[translation]

commit a8232bb10c797daae0e41f20d4f810864f1c56e2
Author: Translation commit bot 
Date:   Fri Jul 14 15:46:21 2017 +

Update translations for tails-misc_completed
---
 id.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id.po b/id.po
index 2374d3b..af5c103 100644
--- a/id.po
+++ b/id.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-05 11:57+0200\n"
-"PO-Revision-Date: 2017-05-26 14:47+\n"
+"PO-Revision-Date: 2017-07-14 15:30+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"

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

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

[translation]

commit 1ff7b3f3b40a70e32a45c7a0e0fdea9f7321e9db
Author: Translation commit bot 
Date:   Fri Jul 14 15:46:56 2017 +

Update translations for tails-perl5lib_completed
---
 id.po | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/id.po b/id.po
index f0af972..a5af83f 100644
--- a/id.po
+++ b/id.po
@@ -3,17 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mohamad Hasan Al Banna , 2016
-# ba dwi , 2014
-# zk , 2016
-# zk , 2015
+# Mohamad Hasan Al Banna , 2016
+# moi, 2017
+# Badwi , 2014
+# zk, 2016
+# zk, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-01-25 16:59+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Mohamad Hasan Al Banna \n"
+"POT-Creation-Date: 2017-05-20 10:59+0200\n"
+"PO-Revision-Date: 2017-07-14 15:30+\n"
+"Last-Translator: moi\n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 
 #: ../lib/Tails/RunningSystem.pm:159
 msgid "Error"
-msgstr "Galat"
+msgstr "Kesalahan"
 
 #: ../lib/Tails/RunningSystem.pm:161
 msgid ""

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

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

[translation]

commit 600050b79bf2d4551d4a06c2aad91bd4aca0ce63
Author: Translation commit bot 
Date:   Fri Jul 14 15:46:17 2017 +

Update translations for tails-misc
---
 id.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id.po b/id.po
index 2374d3b..af5c103 100644
--- a/id.po
+++ b/id.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-05 11:57+0200\n"
-"PO-Revision-Date: 2017-05-26 14:47+\n"
+"PO-Revision-Date: 2017-07-14 15:30+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"

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

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

[translation]

commit 1cc576c5db75b9427001a0d700d293afaf52b5e1
Author: Translation commit bot 
Date:   Fri Jul 14 15:46:52 2017 +

Update translations for tails-perl5lib
---
 id.po | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/id.po b/id.po
index f0af972..a5af83f 100644
--- a/id.po
+++ b/id.po
@@ -3,17 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mohamad Hasan Al Banna , 2016
-# ba dwi , 2014
-# zk , 2016
-# zk , 2015
+# Mohamad Hasan Al Banna , 2016
+# moi, 2017
+# Badwi , 2014
+# zk, 2016
+# zk, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-01-25 16:59+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Mohamad Hasan Al Banna \n"
+"POT-Creation-Date: 2017-05-20 10:59+0200\n"
+"PO-Revision-Date: 2017-07-14 15:30+\n"
+"Last-Translator: moi\n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 
 #: ../lib/Tails/RunningSystem.pm:159
 msgid "Error"
-msgstr "Galat"
+msgstr "Kesalahan"
 
 #: ../lib/Tails/RunningSystem.pm:161
 msgid ""

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

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

[translation]

commit d0f9933299425a77ba4e940a5d129aaab7c476eb
Author: Translation commit bot 
Date:   Fri Jul 14 15:45:37 2017 +

Update translations for tails-persistence-setup
---
 id/id.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id/id.po b/id/id.po
index 55e1e80..55399a4 100644
--- a/id/id.po
+++ b/id/id.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2017-05-17 03:09+\n"
+"PO-Revision-Date: 2017-07-14 15:30+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [tor/master] Fix 32-bit warnings in hs_common.c

[nickm]

commit 9a1338d9df938fba0c3e56e216dfe07237ed934b
Author: Nick Mathewson 
Date:   Fri Jul 14 11:33:12 2017 -0400

Fix 32-bit warnings in hs_common.c
---
 src/or/hs_common.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/or/hs_common.c b/src/or/hs_common.c
index 22a845f..27330bf 100644
--- a/src/or/hs_common.c
+++ b/src/or/hs_common.c
@@ -459,9 +459,10 @@ hs_parse_address(const char *address, ed25519_public_key_t 
*key_out,
   /* Obvious length check. */
   if (strlen(address) != HS_SERVICE_ADDR_LEN_BASE32) {
 log_warn(LD_REND, "Service address %s has an invalid length. "
-  "Expected %ld but got %lu.",
- escaped_safe_str(address), HS_SERVICE_ADDR_LEN_BASE32,
- strlen(address));
+  "Expected %lu but got %lu.",
+ escaped_safe_str(address),
+ (unsigned long) HS_SERVICE_ADDR_LEN_BASE32,
+ (unsigned long) strlen(address));
 goto invalid;
   }
 

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

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

[translation]

commit 1824007733afcbaa3616cb0011ebcba32e730bc4
Author: Translation commit bot 
Date:   Fri Jul 14 14:48:26 2017 +

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

diff --git a/el/el.po b/el/el.po
index 8a15ad3..51208dc 100644
--- a/el/el.po
+++ b/el/el.po
@@ -10,12 +10,13 @@
 # ilias_ , 2016
 # Adrian Pappas , 2017
 # Michael T. , 2017
+# Leonidas P. , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Michael T. , 2017\n"
+"Last-Translator: Leonidas P. , 2017\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,6 +79,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"Από προεπιλογή, ο Φυλλομετρητής Tor δεν 
κρατά κανένα ιστορικό περιήγησης. Τα"
+" cookies είναι έγκυρα μόνο για μια συνεδρία 
(μέχρι να κλείσει ο "
+"Φυλλομετρητής Tor ή να ζητηθεί μια Νέα Ταυτότητα)."
 
 #: about-tor-browser.page:50
 msgid "How Tor works"

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

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

[translation]

commit 33ce39f0e3de521047a4de45de4d443f2a44f894
Author: Translation commit bot 
Date:   Fri Jul 14 14:45:37 2017 +

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

diff --git a/el/el.po b/el/el.po
index 90b268e..ed33f53 100644
--- a/el/el.po
+++ b/el/el.po
@@ -8,6 +8,7 @@
 # dpdt1 , 2013
 # dpdt1 , 2012
 # James Bridge , 2012
+# Leonidas P., 2017
 # metamec, 2015
 # mitzie , 2012
 # Wasilis Mandratzis , 2013
@@ -16,8 +17,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2017-05-17 03:09+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-07-14 14:21+\n"
+"Last-Translator: Leonidas P.\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,7 +64,7 @@ msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
 msgid "Thunderbird profiles and locally stored email"
-msgstr ""
+msgstr "Προφίλ Thunderbird και τοπικά αποθηκευμένο 
email"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"

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

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

[translation]

commit 8b40deacf0ece8d1b2a0a425f816c0c9030f43a1
Author: Translation commit bot 
Date:   Fri Jul 14 14:45:30 2017 +

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

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index e9fab2a..3ce8b29 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -17,14 +17,15 @@
 # Windson yang , 2015
 # YF , 2016
 # YF , 2013-2015,2017
+# Yu Zhou , 2017
 # 甘 露 , 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-10 07:50+0200\n"
-"PO-Revision-Date: 2017-06-12 17:20+\n"
-"Last-Translator: YF \n"
+"POT-Creation-Date: 2017-06-30 13:14+0200\n"
+"PO-Revision-Date: 2017-07-14 14:22+\n"
+"Last-Translator: Yu Zhou \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -354,7 +355,7 @@ msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
 "manufacturer and Tails will fail to start on it. Please try installing on a "
 "different model."
-msgstr ""
+msgstr "æ­¤USB移动存储设备\"%(pretty_name)s\"被生产厂商é…
ç½®ä¸ºéžå¯ç§»åŠ¨ç£ç›˜ï¼ŒTail无法在其上启动。请尝试在å…
¶ä»–移动存储设备上安装。"
 
 #: ../tails_installer/gui.py:498
 #, python-format
@@ -557,7 +558,7 @@ msgstr "通过克隆安装"
 msgid ""
 "• Install Tails on another USB stick by copying the Tails system that you "
 "are currently using."
-msgstr ""
+msgstr "通过复制你正在使用的Tails系统，安装
Tails到另一个USB移动存储设备。"
 
 #: ../data/tails-installer-launcher.ui.h:11
 msgid ""

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

[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

[hiro]

commit 2131b93aa996ca3bfed42f47f93cbd84473fbf70
Merge: f5b2e3f f673f59
Author: hiromipaw 
Date:   Fri Jul 14 16:19:29 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/contributors.wml |6 +
 about/en/corepeople.wml   |6 -
 about/en/corepeople_alternate.wml |  207 +-
 images/people/agrabeli.png|  Bin 0 -> 29509 bytes
 images/people/arma.png|  Bin 0 -> 34872 bytes
 images/people/bparker.png |  Bin 0 -> 21887 bytes
 images/people/dawuud.png  |  Bin 0 -> 22257 bytes
 images/people/isabela.png |  Bin 0 -> 14705 bytes
 images/people/ln5.png |  Bin 0 -> 34926 bytes
 images/people/n8fr8.png   |  Bin 0 -> 32079 bytes
 images/people/nickm.png   |  Bin 0 -> 41516 bytes
 images/people/orig/agrabeli.jpg   |  Bin 0 -> 19745 bytes
 images/people/orig/arma.jpg   |  Bin 0 -> 74271 bytes
 images/people/orig/dawuud.jpg |  Bin 0 -> 9640 bytes
 images/people/orig/isabela.jpg|  Bin 0 -> 16817 bytes
 images/people/orig/kat5.jpg   |  Bin 1013588 -> 0 bytes
 images/people/orig/ln5.jpg|  Bin 0 -> 18819 bytes
 images/people/orig/n8fr8.jpg  |  Bin 0 -> 21843 bytes
 images/people/orig/pepijn.jpg |  Bin 0 -> 1025994 bytes
 images/people/orig/robt.png   |  Bin 0 -> 689358 bytes
 images/people/orig/serene.jpg |  Bin 0 -> 42790 bytes
 images/people/orig/syverson.jpg   |  Bin 0 -> 729689 bytes
 images/people/pepijn.png  |  Bin 0 -> 31866 bytes
 images/people/robt.png|  Bin 0 -> 35268 bytes
 images/people/roya.png|  Bin 0 -> 36754 bytes
 images/people/serene.png  |  Bin 0 -> 33567 bytes
 images/people/syverson.png|  Bin 0 -> 14050 bytes
 keys/agrabeli.txt |   66 +
 keys/ahf.txt  |  172 -
 keys/ailanthus.txt|  168 -
 keys/arlolra.txt  | 1534 
 keys/arthuredelstein.txt  |   27 -
 keys/asn.txt  |  175 -
 keys/atagar.txt   |   56 -
 keys/bparker.txt  |   63 +
 keys/dgoulet.txt  | 2437 
 keys/flexlibris.txt   |  771 
 keys/geko.txt |  833 
 keys/hellais.txt  |   99 -
 keys/hiro.txt | 1903 --
 keys/karsten.txt  | 1074 --
 keys/linda.txt|  315 --
 keys/mcs.txt  |   29 -
 keys/mrphs.txt|  352 --
 keys/nickm.txt|  606 ---
 keys/pastly.txt   |   97 -
 keys/phoul.txt|  915 -
 keys/qbi.txt  | 7515 -
 keys/robt.txt |   47 +
 keys/saint.txt|  766 
 keys/sukhe.txt|  371 --
 keys/teor.txt | 1156 --
 keys/tjr.txt  |  507 ---
 keys/wseltzer.txt |  590 ---
 54 files changed, 353 insertions(+), 22510 deletions(-)

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

[tor-commits] [webwml/master] Use correct OS names in TorBrowser project page

[hiro]

commit f5b2e3f69adb8ebade836216e5759da89a56be2c
Author: hiromipaw 
Date:   Fri Jul 14 16:19:09 2017 +0200

Use correct OS names in TorBrowser project page
---
 projects/en/torbrowser.wml | 436 ++---
 1 file changed, 218 insertions(+), 218 deletions(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index f4073e9..65ea85e 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -26,7 +26,7 @@
   it prevents the sites you visit from learning your physical location,
   and it lets you access sites which are blocked.
   Tor Browser lets you use Tor on
-  Windows, Mac OS X, or Linux without needing to install any software.
+  Microsoft Windows, Apple MacOS, or GNU/Linux without needing to install 
any software.
   It can run off a USB flash drive, comes with a pre-configured web
   browser to protect your anonymity, and is self-contained
   (portable).
@@ -38,7 +38,7 @@
 Tor Browser
   
   Installation Instructions
-  Windows  Mac OS X 
 Linux
+  Microsoft Windows  Apple MacOS  GNU/Linux
 
 
   
   
   
 Tor Browser Downloads
-To start using Tor Browser, download the file 
+To start using Tor Browser, download the file
 for your
 preferred language. This file can be saved wherever is convenient,
 e.g. the Desktop or a USB flash drive.
@@ -83,102 +83,102 @@
 
   Language
   Microsoft Windows()
-  Mac OS X()
-  Linux()
+  Apple MacOS()
+  GNU/Linux()
 
   
   
 
   English (en-US)
-  32/64-bit
 
+  32/64-bit
   (sig)
-  64-bit
 
-  (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 

(ar)
-  32/64-bit
 
+  32/64-bit
   (sig)
-  64-bit
 
-  (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 
   Deutsch (de)
-  32/64-bit
 
+  32/64-bit
   (sig)
-  64-bit
 
-  (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 

(es-ES)
-  32/64-bit
 
+  32/64-bit
   (sig)
   64-bit
 
+  
href="../dist/torbrowser//TorBrowser--osx64_es-ES.dmg">64-bit
   (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 
(fa)
   32/64-bit
   (sig)
-  64-bit
 
-  (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 

(fr)
   32/64-bit
   (sig)
-  64-bit
 
-  (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 
   Italiano (it)
   32/64-bit
   (sig)
-  64-bit
 
-  (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 
@@ -196,107 +196,107 @@
 
 
   Korean (ko)
-  32/64-bit
 
+  32/64-bit
   (sig)
-  64-bit
 
-  (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 
   Nederlands (nl)
-  32/64-bit
 
+  32/64-bit
   (sig)
-  64-bit
 
-  (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 
   Polish (pl)
-  32/64-bit
 
+  32/64-bit
   (sig)
-  64-bit
 
-  (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 
   
 
(pt-BR)
-  32/64-bit
 
+  32/64-bit
   (sig)
-  64-bit
 
-  (sig)
 
-  
-  32-bit
 
-  (sig)
 
-   64-bit
 
+  32-bit
+  (sig)
+   64-bit
   (sig)
 
 

(ru)
-  32/64-bit
 
+  32/64-bit
   (sig)
-  64-bit
 
+  64-bit
   (sig)
 
-   

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

[nickm]

commit 3a7d757140c344986fba5769b47dc10d925fe119
Merge: ed0fb21 3cec178
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:08 2017 -0400

Merge branch 'bug22916_027' into maint-0.2.9

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

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

[nickm]

commit c90ea4ee18a8acf71832d464d720e9b9e96a866a
Merge: ce2f38f f5d2f79
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

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

[nickm]

commit 3a7d757140c344986fba5769b47dc10d925fe119
Merge: ed0fb21 3cec178
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:08 2017 -0400

Merge branch 'bug22916_027' into maint-0.2.9

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

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

[nickm]

commit c7912909e3d79ed65684b6430eb524d4bbae54de
Merge: d67c665 3a7d757
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

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

[nickm]

commit 3a7d757140c344986fba5769b47dc10d925fe119
Merge: ed0fb21 3cec178
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:08 2017 -0400

Merge branch 'bug22916_027' into maint-0.2.9

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

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

[nickm]

commit f5d2f79acafc0cb7698442aec3323b2abe802e37
Merge: c1afbbe 3a7d757
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.2.9] Fix compiler warnings with openssl-scrypt/libscrypt test on clang

[nickm]

commit 3cec1783b7960a37ef51b5dc86dd1492b608f6e7
Author: Nick Mathewson 
Date:   Thu Jul 13 17:49:48 2017 -0400

Fix compiler warnings with openssl-scrypt/libscrypt test on clang

Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t.  GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.

Fixes bug22916; bugfix on 0.2.7.2-alpha.
---
 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug22916_027 b/changes/bug22916_027
new file mode 100644
index 000..5cf99c7
--- /dev/null
+++ b/changes/bug22916_027
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Compilation):
+- Fix warnings when building with libscrypt and openssl scrypt support
+  on Clang. Fixes bug 22916; bugfix on 0.2.7.2-alpha.
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index 853a08d..ab28ef5 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -136,7 +136,8 @@ test_libscrypt_eq_openssl(void *arg)
   uint8_t buf1[64];
   uint8_t buf2[64];
 
-  uint64_t N, r, p;
+  uint64_t N;
+  uint32_t r, p;
   uint64_t maxmem = 0; // --> SCRYPT_MAX_MEM in OpenSSL.
 
   int libscrypt_retval, openssl_retval;



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

[tor-commits] [tor/maint-0.2.9] Fix compiler warnings with openssl-scrypt/libscrypt test on clang

[nickm]

commit 3cec1783b7960a37ef51b5dc86dd1492b608f6e7
Author: Nick Mathewson 
Date:   Thu Jul 13 17:49:48 2017 -0400

Fix compiler warnings with openssl-scrypt/libscrypt test on clang

Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t.  GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.

Fixes bug22916; bugfix on 0.2.7.2-alpha.
---
 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug22916_027 b/changes/bug22916_027
new file mode 100644
index 000..5cf99c7
--- /dev/null
+++ b/changes/bug22916_027
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Compilation):
+- Fix warnings when building with libscrypt and openssl scrypt support
+  on Clang. Fixes bug 22916; bugfix on 0.2.7.2-alpha.
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index 853a08d..ab28ef5 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -136,7 +136,8 @@ test_libscrypt_eq_openssl(void *arg)
   uint8_t buf1[64];
   uint8_t buf2[64];
 
-  uint64_t N, r, p;
+  uint64_t N;
+  uint32_t r, p;
   uint64_t maxmem = 0; // --> SCRYPT_MAX_MEM in OpenSSL.
 
   int libscrypt_retval, openssl_retval;



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

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

[nickm]

commit 4db33ecc04ef2ad8bb7ef04d8c67b3ae4a46d8bf
Merge: 5eefa43 52c1754
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/release-0.3.1] Fix compiler warnings with openssl-scrypt/libscrypt test on clang

[nickm]

commit 3cec1783b7960a37ef51b5dc86dd1492b608f6e7
Author: Nick Mathewson 
Date:   Thu Jul 13 17:49:48 2017 -0400

Fix compiler warnings with openssl-scrypt/libscrypt test on clang

Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t.  GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.

Fixes bug22916; bugfix on 0.2.7.2-alpha.
---
 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug22916_027 b/changes/bug22916_027
new file mode 100644
index 000..5cf99c7
--- /dev/null
+++ b/changes/bug22916_027
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Compilation):
+- Fix warnings when building with libscrypt and openssl scrypt support
+  on Clang. Fixes bug 22916; bugfix on 0.2.7.2-alpha.
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index 853a08d..ab28ef5 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -136,7 +136,8 @@ test_libscrypt_eq_openssl(void *arg)
   uint8_t buf1[64];
   uint8_t buf2[64];
 
-  uint64_t N, r, p;
+  uint64_t N;
+  uint32_t r, p;
   uint64_t maxmem = 0; // --> SCRYPT_MAX_MEM in OpenSSL.
 
   int libscrypt_retval, openssl_retval;



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

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

[nickm]

commit 52c1754ff6b7f181ab40d1f3148ed6a28d60cef5
Merge: bbc75fa f5d2f79
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

[tor-commits] [tor/release-0.3.0] Fix compiler warnings with openssl-scrypt/libscrypt test on clang

[nickm]

commit 3cec1783b7960a37ef51b5dc86dd1492b608f6e7
Author: Nick Mathewson 
Date:   Thu Jul 13 17:49:48 2017 -0400

Fix compiler warnings with openssl-scrypt/libscrypt test on clang

Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t.  GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.

Fixes bug22916; bugfix on 0.2.7.2-alpha.
---
 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug22916_027 b/changes/bug22916_027
new file mode 100644
index 000..5cf99c7
--- /dev/null
+++ b/changes/bug22916_027
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Compilation):
+- Fix warnings when building with libscrypt and openssl scrypt support
+  on Clang. Fixes bug 22916; bugfix on 0.2.7.2-alpha.
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index 853a08d..ab28ef5 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -136,7 +136,8 @@ test_libscrypt_eq_openssl(void *arg)
   uint8_t buf1[64];
   uint8_t buf2[64];
 
-  uint64_t N, r, p;
+  uint64_t N;
+  uint32_t r, p;
   uint64_t maxmem = 0; // --> SCRYPT_MAX_MEM in OpenSSL.
 
   int libscrypt_retval, openssl_retval;



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

[tor-commits] [tor/master] Fix compiler warnings with openssl-scrypt/libscrypt test on clang

[nickm]

commit 3cec1783b7960a37ef51b5dc86dd1492b608f6e7
Author: Nick Mathewson 
Date:   Thu Jul 13 17:49:48 2017 -0400

Fix compiler warnings with openssl-scrypt/libscrypt test on clang

Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t.  GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.

Fixes bug22916; bugfix on 0.2.7.2-alpha.
---
 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug22916_027 b/changes/bug22916_027
new file mode 100644
index 000..5cf99c7
--- /dev/null
+++ b/changes/bug22916_027
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Compilation):
+- Fix warnings when building with libscrypt and openssl scrypt support
+  on Clang. Fixes bug 22916; bugfix on 0.2.7.2-alpha.
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index 853a08d..ab28ef5 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -136,7 +136,8 @@ test_libscrypt_eq_openssl(void *arg)
   uint8_t buf1[64];
   uint8_t buf2[64];
 
-  uint64_t N, r, p;
+  uint64_t N;
+  uint32_t r, p;
   uint64_t maxmem = 0; // --> SCRYPT_MAX_MEM in OpenSSL.
 
   int libscrypt_retval, openssl_retval;



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

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

[nickm]

commit 3a7d757140c344986fba5769b47dc10d925fe119
Merge: ed0fb21 3cec178
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:08 2017 -0400

Merge branch 'bug22916_027' into maint-0.2.9

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

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

[nickm]

commit f5d2f79acafc0cb7698442aec3323b2abe802e37
Merge: c1afbbe 3a7d757
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



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

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

[nickm]

commit f5d2f79acafc0cb7698442aec3323b2abe802e37
Merge: c1afbbe 3a7d757
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



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

[tor-commits] [tor/maint-0.3.0] Fix compiler warnings with openssl-scrypt/libscrypt test on clang

[nickm]

commit 3cec1783b7960a37ef51b5dc86dd1492b608f6e7
Author: Nick Mathewson 
Date:   Thu Jul 13 17:49:48 2017 -0400

Fix compiler warnings with openssl-scrypt/libscrypt test on clang

Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t.  GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.

Fixes bug22916; bugfix on 0.2.7.2-alpha.
---
 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug22916_027 b/changes/bug22916_027
new file mode 100644
index 000..5cf99c7
--- /dev/null
+++ b/changes/bug22916_027
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Compilation):
+- Fix warnings when building with libscrypt and openssl scrypt support
+  on Clang. Fixes bug 22916; bugfix on 0.2.7.2-alpha.
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index 853a08d..ab28ef5 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -136,7 +136,8 @@ test_libscrypt_eq_openssl(void *arg)
   uint8_t buf1[64];
   uint8_t buf2[64];
 
-  uint64_t N, r, p;
+  uint64_t N;
+  uint32_t r, p;
   uint64_t maxmem = 0; // --> SCRYPT_MAX_MEM in OpenSSL.
 
   int libscrypt_retval, openssl_retval;



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

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

[nickm]

commit d0816a040dbb9a5e18b76b3fb30011b19f6660b0
Merge: ce5d8c9 52c1754
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.3.1'

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.3.1] Fix compiler warnings with openssl-scrypt/libscrypt test on clang

[nickm]

commit 3cec1783b7960a37ef51b5dc86dd1492b608f6e7
Author: Nick Mathewson 
Date:   Thu Jul 13 17:49:48 2017 -0400

Fix compiler warnings with openssl-scrypt/libscrypt test on clang

Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t.  GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.

Fixes bug22916; bugfix on 0.2.7.2-alpha.
---
 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug22916_027 b/changes/bug22916_027
new file mode 100644
index 000..5cf99c7
--- /dev/null
+++ b/changes/bug22916_027
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Compilation):
+- Fix warnings when building with libscrypt and openssl scrypt support
+  on Clang. Fixes bug 22916; bugfix on 0.2.7.2-alpha.
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index 853a08d..ab28ef5 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -136,7 +136,8 @@ test_libscrypt_eq_openssl(void *arg)
   uint8_t buf1[64];
   uint8_t buf2[64];
 
-  uint64_t N, r, p;
+  uint64_t N;
+  uint32_t r, p;
   uint64_t maxmem = 0; // --> SCRYPT_MAX_MEM in OpenSSL.
 
   int libscrypt_retval, openssl_retval;



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

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

[nickm]

commit 3a7d757140c344986fba5769b47dc10d925fe119
Merge: ed0fb21 3cec178
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:08 2017 -0400

Merge branch 'bug22916_027' into maint-0.2.9

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

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

[nickm]

commit f5d2f79acafc0cb7698442aec3323b2abe802e37
Merge: c1afbbe 3a7d757
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

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

[nickm]

commit 3a7d757140c344986fba5769b47dc10d925fe119
Merge: ed0fb21 3cec178
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:08 2017 -0400

Merge branch 'bug22916_027' into maint-0.2.9

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

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

[nickm]

commit 52c1754ff6b7f181ab40d1f3148ed6a28d60cef5
Merge: bbc75fa f5d2f79
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

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

[nickm]

commit 52c1754ff6b7f181ab40d1f3148ed6a28d60cef5
Merge: bbc75fa f5d2f79
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

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

[nickm]

commit f5d2f79acafc0cb7698442aec3323b2abe802e37
Merge: c1afbbe 3a7d757
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)



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

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

[nickm]

commit 3a7d757140c344986fba5769b47dc10d925fe119
Merge: ed0fb21 3cec178
Author: Nick Mathewson 
Date:   Fri Jul 14 09:11:08 2017 -0400

Merge branch 'bug22916_027' into maint-0.2.9

 changes/bug22916_027| 3 +++
 src/test/test_crypto_slow.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)




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

[tor-commits] [tor/release-0.3.0] Fix unit test memory leak in certs_ok_ed25519.

[nickm]

commit 759154b1ad8b2b5fabf09cb1dde93177c65d05a8
Author: Nick Mathewson 
Date:   Wed Jul 5 15:42:25 2017 -0400

Fix unit test memory leak in certs_ok_ed25519.

Fixes bug 22803; bugfix on 0.3.0.1-alpha.
---
 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug22803 b/changes/bug22803
new file mode 100644
index 000..80b4b9f
--- /dev/null
+++ b/changes/bug22803
@@ -0,0 +1,3 @@
+  o Minor bugfixes (unit tests):
+- Fix a memory leak in the link-handshake/certs_ok_ed25519 test.
+  Fixes bug 22803; bugfix on 0.3.0.1-alpha.
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index d81f9e8..467bba3 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -241,6 +241,7 @@ test_link_handshake_certs_ok(void *arg)
   }
   channel_tls_process_certs_cell(cell2, chan1);
   mock_peer_cert_expect_tortls = NULL;
+  tor_x509_cert_free(mock_peer_cert);
   mock_peer_cert = NULL;
 
   tor_assert(c1->handshake_state->authenticated);
@@ -304,7 +305,8 @@ test_link_handshake_certs_ok(void *arg)
   UNMOCK(tor_tls_get_peer_cert);
   UNMOCK(tor_tls_get_own_cert);
   tor_x509_cert_free(mock_own_cert);
-  mock_own_cert = NULL;
+  tor_x509_cert_free(mock_peer_cert);
+  mock_own_cert = mock_peer_cert = NULL;
   memset(c1->identity_digest, 0, sizeof(c1->identity_digest));
   memset(c2->identity_digest, 0, sizeof(c2->identity_digest));
   connection_free_(TO_CONN(c1));



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

[tor-commits] [tor/master] Fix unit test memory leak in certs_ok_ed25519.

[nickm]

commit 759154b1ad8b2b5fabf09cb1dde93177c65d05a8
Author: Nick Mathewson 
Date:   Wed Jul 5 15:42:25 2017 -0400

Fix unit test memory leak in certs_ok_ed25519.

Fixes bug 22803; bugfix on 0.3.0.1-alpha.
---
 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug22803 b/changes/bug22803
new file mode 100644
index 000..80b4b9f
--- /dev/null
+++ b/changes/bug22803
@@ -0,0 +1,3 @@
+  o Minor bugfixes (unit tests):
+- Fix a memory leak in the link-handshake/certs_ok_ed25519 test.
+  Fixes bug 22803; bugfix on 0.3.0.1-alpha.
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index d81f9e8..467bba3 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -241,6 +241,7 @@ test_link_handshake_certs_ok(void *arg)
   }
   channel_tls_process_certs_cell(cell2, chan1);
   mock_peer_cert_expect_tortls = NULL;
+  tor_x509_cert_free(mock_peer_cert);
   mock_peer_cert = NULL;
 
   tor_assert(c1->handshake_state->authenticated);
@@ -304,7 +305,8 @@ test_link_handshake_certs_ok(void *arg)
   UNMOCK(tor_tls_get_peer_cert);
   UNMOCK(tor_tls_get_own_cert);
   tor_x509_cert_free(mock_own_cert);
-  mock_own_cert = NULL;
+  tor_x509_cert_free(mock_peer_cert);
+  mock_own_cert = mock_peer_cert = NULL;
   memset(c1->identity_digest, 0, sizeof(c1->identity_digest));
   memset(c2->identity_digest, 0, sizeof(c2->identity_digest));
   connection_free_(TO_CONN(c1));



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

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

[nickm]

commit 5eefa43137863057cf762192b47e4f979b4071a6
Merge: 05ca8ab bbc75fa
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:44 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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

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

[nickm]

commit c1afbbe8feff1b803f721079b59a00438676045e
Merge: 66c85cd 759154b
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:33 2017 -0400

Merge branch 'bug22803_030' into maint-0.3.0

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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

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

[nickm]

commit bbc75faed1f7b73104ee706fc469249ad8f3d15c
Merge: 66258f8 c1afbbe
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:44 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)




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

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

[nickm]

commit ce5d8c92dd6d1cbd71ceea562c5be74058ce0e28
Merge: ef4ea86 bbc75fa
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:44 2017 -0400

Merge branch 'maint-0.3.1'

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/release-0.3.1] Fix unit test memory leak in certs_ok_ed25519.

[nickm]

commit 759154b1ad8b2b5fabf09cb1dde93177c65d05a8
Author: Nick Mathewson 
Date:   Wed Jul 5 15:42:25 2017 -0400

Fix unit test memory leak in certs_ok_ed25519.

Fixes bug 22803; bugfix on 0.3.0.1-alpha.
---
 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug22803 b/changes/bug22803
new file mode 100644
index 000..80b4b9f
--- /dev/null
+++ b/changes/bug22803
@@ -0,0 +1,3 @@
+  o Minor bugfixes (unit tests):
+- Fix a memory leak in the link-handshake/certs_ok_ed25519 test.
+  Fixes bug 22803; bugfix on 0.3.0.1-alpha.
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index d81f9e8..467bba3 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -241,6 +241,7 @@ test_link_handshake_certs_ok(void *arg)
   }
   channel_tls_process_certs_cell(cell2, chan1);
   mock_peer_cert_expect_tortls = NULL;
+  tor_x509_cert_free(mock_peer_cert);
   mock_peer_cert = NULL;
 
   tor_assert(c1->handshake_state->authenticated);
@@ -304,7 +305,8 @@ test_link_handshake_certs_ok(void *arg)
   UNMOCK(tor_tls_get_peer_cert);
   UNMOCK(tor_tls_get_own_cert);
   tor_x509_cert_free(mock_own_cert);
-  mock_own_cert = NULL;
+  tor_x509_cert_free(mock_peer_cert);
+  mock_own_cert = mock_peer_cert = NULL;
   memset(c1->identity_digest, 0, sizeof(c1->identity_digest));
   memset(c2->identity_digest, 0, sizeof(c2->identity_digest));
   connection_free_(TO_CONN(c1));



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

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

[nickm]

commit c1afbbe8feff1b803f721079b59a00438676045e
Merge: 66c85cd 759154b
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:33 2017 -0400

Merge branch 'bug22803_030' into maint-0.3.0

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

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

[nickm]

commit c1afbbe8feff1b803f721079b59a00438676045e
Merge: 66c85cd 759154b
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:33 2017 -0400

Merge branch 'bug22803_030' into maint-0.3.0

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

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

[nickm]

commit c1afbbe8feff1b803f721079b59a00438676045e
Merge: 66c85cd 759154b
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:33 2017 -0400

Merge branch 'bug22803_030' into maint-0.3.0

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

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

[nickm]

commit bbc75faed1f7b73104ee706fc469249ad8f3d15c
Merge: 66258f8 c1afbbe
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:44 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)




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

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

[nickm]

commit bbc75faed1f7b73104ee706fc469249ad8f3d15c
Merge: 66258f8 c1afbbe
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:44 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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

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

[nickm]

commit ce2f38f05449b847799e4f9982ad3507d9a56e37
Merge: 72f06fc c1afbbe
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:44 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.3.0] Fix unit test memory leak in certs_ok_ed25519.

[nickm]

commit 759154b1ad8b2b5fabf09cb1dde93177c65d05a8
Author: Nick Mathewson 
Date:   Wed Jul 5 15:42:25 2017 -0400

Fix unit test memory leak in certs_ok_ed25519.

Fixes bug 22803; bugfix on 0.3.0.1-alpha.
---
 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug22803 b/changes/bug22803
new file mode 100644
index 000..80b4b9f
--- /dev/null
+++ b/changes/bug22803
@@ -0,0 +1,3 @@
+  o Minor bugfixes (unit tests):
+- Fix a memory leak in the link-handshake/certs_ok_ed25519 test.
+  Fixes bug 22803; bugfix on 0.3.0.1-alpha.
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index d81f9e8..467bba3 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -241,6 +241,7 @@ test_link_handshake_certs_ok(void *arg)
   }
   channel_tls_process_certs_cell(cell2, chan1);
   mock_peer_cert_expect_tortls = NULL;
+  tor_x509_cert_free(mock_peer_cert);
   mock_peer_cert = NULL;
 
   tor_assert(c1->handshake_state->authenticated);
@@ -304,7 +305,8 @@ test_link_handshake_certs_ok(void *arg)
   UNMOCK(tor_tls_get_peer_cert);
   UNMOCK(tor_tls_get_own_cert);
   tor_x509_cert_free(mock_own_cert);
-  mock_own_cert = NULL;
+  tor_x509_cert_free(mock_peer_cert);
+  mock_own_cert = mock_peer_cert = NULL;
   memset(c1->identity_digest, 0, sizeof(c1->identity_digest));
   memset(c2->identity_digest, 0, sizeof(c2->identity_digest));
   connection_free_(TO_CONN(c1));



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

[tor-commits] [tor/maint-0.3.1] Fix unit test memory leak in certs_ok_ed25519.

[nickm]

commit 759154b1ad8b2b5fabf09cb1dde93177c65d05a8
Author: Nick Mathewson 
Date:   Wed Jul 5 15:42:25 2017 -0400

Fix unit test memory leak in certs_ok_ed25519.

Fixes bug 22803; bugfix on 0.3.0.1-alpha.
---
 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug22803 b/changes/bug22803
new file mode 100644
index 000..80b4b9f
--- /dev/null
+++ b/changes/bug22803
@@ -0,0 +1,3 @@
+  o Minor bugfixes (unit tests):
+- Fix a memory leak in the link-handshake/certs_ok_ed25519 test.
+  Fixes bug 22803; bugfix on 0.3.0.1-alpha.
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index d81f9e8..467bba3 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -241,6 +241,7 @@ test_link_handshake_certs_ok(void *arg)
   }
   channel_tls_process_certs_cell(cell2, chan1);
   mock_peer_cert_expect_tortls = NULL;
+  tor_x509_cert_free(mock_peer_cert);
   mock_peer_cert = NULL;
 
   tor_assert(c1->handshake_state->authenticated);
@@ -304,7 +305,8 @@ test_link_handshake_certs_ok(void *arg)
   UNMOCK(tor_tls_get_peer_cert);
   UNMOCK(tor_tls_get_own_cert);
   tor_x509_cert_free(mock_own_cert);
-  mock_own_cert = NULL;
+  tor_x509_cert_free(mock_peer_cert);
+  mock_own_cert = mock_peer_cert = NULL;
   memset(c1->identity_digest, 0, sizeof(c1->identity_digest));
   memset(c2->identity_digest, 0, sizeof(c2->identity_digest));
   connection_free_(TO_CONN(c1));



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

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

[nickm]

commit c1afbbe8feff1b803f721079b59a00438676045e
Merge: 66c85cd 759154b
Author: Nick Mathewson 
Date:   Fri Jul 14 09:06:33 2017 -0400

Merge branch 'bug22803_030' into maint-0.3.0

 changes/bug22803   | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)



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

[tor-commits] [tor-browser-bundle/master] Bug 22831: Enable Snowflake for mac.

[gk]

commit ce3fbdf44272e3334d935044599a3b42cf7ff87c
Author: David Fifield 
Date:   Wed Jul 5 23:10:10 2017 -0700

Bug 22831: Enable Snowflake for mac.
---
 Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 3 +++
 gitian/mkbundle-mac.sh| 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix 
b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
index 271b36c..06dbec9 100644
--- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
+++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
@@ -3,3 +3,6 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec 
PluggableTransports/ob
 
 ## meek configuration
 ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- 
PluggableTransports/meek-client
+
+## snowflake configuration
+ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url 
https://snowflake-reg.appspot.com/ -front www.google.com -ice 
stun:stun.l.google.com:19302
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index 7bf546e..4f850c6 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -56,9 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh 
$GITIAN_DIR/inputs/tbb-docs.zip ./Docs/
 rm -f $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip
 (cd PTConfigs/mac && $WRAPPER_DIR/build-helpers/dzip.sh 
$GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip 
TorBrowser.app.meek-http-helper)
 cp PTConfigs/mac/torrc-defaults-appendix 
$GITIAN_DIR/inputs/torrc-defaults-appendix-mac
-# FTE is temporarily removed due to bug 18495 and snowflake is Linux-only for
-# now.
-  grep -Ev 'default_bridge\.fte|default_bridge\.snowflake' 
PTConfigs/bridge_prefs.js > $GITIAN_DIR/inputs/bridge_prefs.js
+# FTE is temporarily removed due to bug 18495.
+  grep -Ev 'default_bridge\.fte' PTConfigs/bridge_prefs.js > 
$GITIAN_DIR/inputs/bridge_prefs.js
 cp PTConfigs/meek-http-helper-user.js $GITIAN_DIR/inputs/
 cp mac-tor.sh $GITIAN_DIR/inputs/
 

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

[tor-commits] [tor-browser-bundle/master] Build go-webrtc and snowflake in the mac pluggable-transports descriptor.

[gk]

commit 26e0cd44f2886bfad1c3d30844ff7a21eb9d0478
Author: David Fifield 
Date:   Wed Jul 5 22:57:22 2017 -0700

Build go-webrtc and snowflake in the mac pluggable-transports descriptor.

I had to apply two tricks to get a reproducible snowflake-client.

The first is to use faketime to eliminate some timestamps. There were 11
variable timestamps in the file. Through experimentation, I found that
10 of them were dependent on the Go runtime (recompiling Go caused them
to change) and 1 was dependent on snowflake-client itself (recompiling
snowflake-client with the same runtime changed only that 1 timestamp).
The underlying issue has to do with clang 3.8.0 on Darwin embedding
timestamps, unsolved in the Go issue tracker as of 13 days ago.
https://github.com/golang/go/issues/9206#issuecomment-310476743

The second is a sed command to clobber embedded paths of the form
/tmp/go-buildX and /tmp/go-link-X. Their presence is
caused by some combination of Clang and Darwin, and there is as yet no
known workaround upstream.
---
 .../mac/gitian-pluggable-transports.yml| 71 +-
 gitian/mkbundle-mac.sh |  2 +-
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml 
b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index 75ad899..ebfcaa9 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -6,7 +6,9 @@ suites:
 architectures:
 - "amd64"
 packages:
+- "faketime"
 - "unzip"
+- "pkg-config"
 - "zip"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
@@ -24,6 +26,12 @@ remotes:
   "dir": "goxnet"
 - "url": "https://git.torproject.org/pluggable-transports/obfs4.git;
   "dir": "obfs4"
+- "url": "https://github.com/keroserene/go-webrtc.git;
+  "dir": "go-webrtc"
+- "url": "https://git.torproject.org/pluggable-transports/snowflake.git;
+  "dir": "snowflake"
+- "url": "https://github.com/dchest/uniuri.git;
+  "dir": "uniuri"
 files:
 - "versions"
 - "go14.tar.gz"
@@ -31,6 +39,7 @@ files:
 - "clang-linux64-jessie-utils.zip"
 - "cctools.tar.gz"
 - "MacOSX10.7.sdk.tar.gz"
+- "webrtc-mac64-gbuilt.zip"
 - "dzip.sh"
 script: |
   INSTDIR="$HOME/install"
@@ -59,6 +68,8 @@ script: |
   tar xaf MacOSX10.7.sdk.tar.gz
   # Preparing clang for cross-compilation, setting the proper flags and
   # variables
+  # "go link" expects to find a program called "dsymutil" exactly.
+  ln -sf x86_64-apple-darwin10-dsymutil $HOME/build/cctools/bin/dsymutil
   # ld needs libLTO.so from llvm
   export LD_LIBRARY_PATH="$HOME/build/clang/lib"
   export PATH="$HOME/build/cctools/bin:$PATH"
@@ -93,7 +104,12 @@ script: |
   export GOARCH=amd64
   tar xvf go.tar.gz
   cd go/src
-  CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash
+  # faketime is needed because clang 3.8.0 on Darwin embeds the timestamps of
+  # certain intermediate object files (including those that arise here while
+  # compiling the Go runtime itself). Without this, variable timestamps would
+  # end up in snowflake-client.
+  # https://github.com/golang/go/issues/9206#issuecomment-310476743
+  CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= faketime 
-f "$REFERENCE_DATETIME" ./make.bash
   cd ../..
   export PATH="$PATH:$PWD/go/bin"
 
@@ -138,6 +154,14 @@ script: |
   go install github.com/dchest/siphash
   cd ..
 
+  # Building go uniuri
+  cd uniuri
+  find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
+  mkdir -p "$GOPATH/src/github.com/dchest/"
+  ln -sf "$PWD" "$GOPATH/src/github.com/dchest/uniuri"
+  go install github.com/dchest/uniuri
+  cd ..
+
   # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4)
   cd goxcrypto
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
@@ -166,6 +190,51 @@ script: |
   cp -a obfs4proxy $PTDIR
   cd ../..
 
+  unzip webrtc-mac64-gbuilt.zip
+  export SDKROOT="$PWD/MacOSX10.7.sdk"
+
+  # Building go-webrtc
+  cd go-webrtc
+  # Replace the prebuilt webrtc library with our own one.
+  rm -rf include/ lib/
+  ln -sf ../webrtc/{include,lib} .
+  find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
+  mkdir -p "$GOPATH/src/github.com/keroserene/"
+  ln -sf "$PWD" "$GOPATH/src/github.com/keroserene/go-webrtc"
+  CFLAGS="$FLAGS -mmacosx-version-min=10.7"
+  CXXFLAGS="$FLAGS -stdlib=libc++ -mmacosx-version-min=10.7"
+  LDFLAGS="$FLAGS -stdlib=libc++ -mmacosx-version-min=10.7"
+  GOARCH=amd64 CGO_ENABLED=1 CGO_CFLAGS="$CFLAGS" CGO_CXXFLAGS="$CXXFLAGS" 
CGO_LDFLAGS="$LDFLAGS" CC="$HOME/build/clang/bin/clang" 
CXX="$HOME/build/clang/bin/clang++" go install github.com/keroserene/go-webrtc
+  cd ..
+
+  # Building snowflake
+  cd snowflake
+  find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
+  cd client
+  # See the faketime comment 

[tor-commits] [tor-browser-bundle/master] Build webrtc for mac.

[gk]

commit fcdc2be0a2da32a939e172564300d5a09259b75e
Author: David Fifield 
Date:   Wed Jul 5 22:55:39 2017 -0700

Build webrtc for mac.
---
 gitian/descriptors/mac/gitian-webrtc.yml | 139 ++
 gitian/mkbundle-mac.sh   |  41 -
 gitian/patches/webrtc-mac.patch  | 305 +++
 3 files changed, 475 insertions(+), 10 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-webrtc.yml 
b/gitian/descriptors/mac/gitian-webrtc.yml
new file mode 100644
index 000..c5f0509
--- /dev/null
+++ b/gitian/descriptors/mac/gitian-webrtc.yml
@@ -0,0 +1,139 @@
+---
+name: "webrtc-mac"
+distro: "debian"
+suites:
+- "jessie"
+architectures:
+- "amd64"
+packages:
+- "unzip"
+- "zip"
+- "libglib2.0-dev"
+- "libgtk2.0-dev"
+- "pkg-config"
+- "python-biplist"
+reference_datetime: "2000-01-01 00:00:00"
+remotes:
+- "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git;
+  "dir": "depot_tools"
+files:
+- "versions"
+- "clang-linux64-jessie-utils.zip"
+- "cctools.tar.gz"
+- "MacOSX10.7.sdk.tar.gz"
+- "dzip.sh"
+- "webrtc.tar.gz"
+- "webrtc-mac.patch"
+script: |
+  INSTDIR="$HOME/install"
+  source versions
+  export REFERENCE_DATETIME
+  export TZ=UTC
+  export LC_ALL=C
+  umask 0022
+  #
+  mkdir -p $OUTDIR/
+
+  # Setting up depot_tools
+  # https://dev.chromium.org/developers/how-tos/install-depot-tools
+  export PATH="$PATH:$PWD/depot_tools"
+  # Disable automatic updating.
+  export DEPOT_TOOLS_UPDATE=0
+
+  # Extracting all the necessary tools
+  tar xaf cctools.tar.gz
+  unzip clang-linux64-jessie-utils.zip
+  tar xaf MacOSX10.7.sdk.tar.gz
+  export SDKROOT="$PWD/MacOSX10.7.sdk"
+  # src/build/toolchain/mac/filter_libtool.py wants libtool to be called 
exactly "libtool".
+  ln -sf x86_64-apple-darwin10-libtool $HOME/build/cctools/bin/libtool
+  # ld needs libLTO.so from llvm
+  export LD_LIBRARY_PATH="$HOME/build/clang/lib"
+  export PATH="$HOME/build/cctools/bin:$PATH"
+  export AR=x86_64-apple-darwin10-ar
+  # Certain cross-compiling flags are set in webrtc-mac.patch because the build
+  # system doesn't honor CFLAGS etc. environment variables.
+
+  # Building webrtc
+  tar xaf webrtc.tar.gz
+  cd webrtc/src
+  patch -p1 < ../../webrtc-mac.patch
+
+  # The linux descriptor builds its own copy of gn, using 
tools/gn/bootstrap/bootstrap.py.
+  # I tried that here, but for some reason the gn so built doesn't work. On 
"gn gen",
+  # it crashes with this error:
+  #   [0624/022439.767916:FATAL:command_gen.cc(59)] Check failed: 
!rule.empty().
+  # Instead, use the gn packaged with depot_tools.
+  GN="$HOME/build/depot_tools/gn"
+
+  # Hardcode the output of some utility programs that otherwise require Xcode
+  # tools, like xcode-select, xcodebuild, sw_vers, and xcrun. This probably
+  # needs to be kept in sync with the SDK version.
+  cat < build/mac/find_sdk.py
+  print("$SDKROOT")
+  print("10.7")
+  EOF
+  cat < build/config/mac/sdk_info.py
+  print("machine_os_build=\"10.7\"")
+  print("sdk_build=\"10.7\"")
+  print("sdk_path=\"$SDKROOT\"")
+  print("sdk_platform_path=\"$SDKROOT\"")
+  print("sdk_version=\"10.7\"")
+  print("xcode_build=\"7.3\"")
+  print("xcode_version=\"0730\"")
+  EOF
+
+  export GN_ARGS=""
+  # For a list of all possible GN args, do "gn gen out/Release; gn args --list 
out/Release".
+  # 
https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/cross_compiles.md
+  GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" 
mac_deployment_target=\"10.7\""
+  # Not debug.
+  GN_ARGS+=" is_debug=false"
+  # There are warnings from unused returns.
+  GN_ARGS+=" treat_warnings_as_errors=false"
+  # Build static libraries.
+  GN_ARGS+=" is_component_build=false"
+  # Do not use bundled utilities.
+  GN_ARGS+=" is_clang=false use_sysroot=false"
+  GN_ARGS+=" clang_use_chrome_plugins=false"
+  GN_ARGS+=" clang_base_path=\"$HOME/build/clang\""
+  GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\""
+  # Avoid some dependencies.
+  GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false 
rtc_include_internal_audio_device=false"
+  # Tests are needed for field_trial, metrics_default, and pc_test_utils 
targets
+  # (which include code needed by go-webrtc).
+  GN_ARGS+=" rtc_include_tests=true"
+  # Make sure not to use bundled clang and binutils.
+  rm -rf third_party/llvm-build
+  rm -rf third_party/binutils
+  rm -rf out/Release
+  "$GN" gen out/Release --args="$GN_ARGS"
+  ninja -C out/Release webrtc field_trial metrics_default pc_test_utils
+  # The cctools ar doesn't have the 'D' deterministic option of GNU ar, but the
+  # ZERO_AR_DATE environment variable similarly sets timestamps within the
+  # archive to zero.
+  # 
https://opensource.apple.com/source/cctools/cctools-886/ar/archive.c.auto.html
+  # https://codereview.chromium.org/699083004/
+  # .o files under out/Release/obj/ are the build outputs. Don't include .o
+  # files from elsewhere under out/ because they are build helpers and things
+  #