commit cae5165b5df31bd577dd4d7265cdffd44bfeb416
Author: Translation commit bot
Date: Sat Aug 10 00:18:03 2019 +
Update translations for tbmanual-contentspot
---
contents+zh-TW.po | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/contents+zh-TW.po b/contents+zh-TW
commit cf220154fd17ab8f73773a2b3a56f14a34307495
Author: Translation commit bot
Date: Fri Aug 9 22:50:30 2019 +
Update translations for tor-launcher-properties
---
de/torlauncher.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/de/torlauncher.properties b/d
commit aec8f8237043a4c0218fcd1bebd6e9eb63110805
Author: Translation commit bot
Date: Fri Aug 9 22:50:39 2019 +
Update translations for tor-launcher-properties_completed
---
de/torlauncher.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/de/torlauncher.prop
commit afb36ac7eef5e3d7ca2e535031d9fbdceb17de3b
Author: Translation commit bot
Date: Fri Aug 9 22:23:10 2019 +
Update translations for support-portal_completed
---
contents+fr.po | 47 ---
1 file changed, 40 insertions(+), 7 deletions(-)
dif
commit fb3c3fd9a506efe2d7564170b4675477cf8a297e
Author: Translation commit bot
Date: Fri Aug 9 22:23:02 2019 +
Update translations for support-portal
---
contents+fr.po | 49 +
1 file changed, 41 insertions(+), 8 deletions(-)
diff --git
commit 2967485742e5c5a352cb98f26fd49d89672d76f8
Author: Translation commit bot
Date: Fri Aug 9 22:20:37 2019 +
Update translations for torbutton-torbuttonproperties
---
tr/torbutton.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tr/torbutton.properti
commit 6c51d029aae8db9f2f77c17dd703f0e9d55aa6a6
Author: Translation commit bot
Date: Fri Aug 9 22:20:48 2019 +
Update translations for torbutton-torbuttonproperties_completed
---
tr/torbutton.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tr/torbutto
commit b5c682dbbeb0fb4edb504aede9f6710c0c8e5df1
Author: Translation commit bot
Date: Fri Aug 9 22:19:49 2019 +
Update translations for torbirdy_completed
---
tr/torbirdy.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd
index f7d7
commit c7a4358fe79c7ce3a8c227fb5bec0904ef19668a
Author: Translation commit bot
Date: Fri Aug 9 22:19:42 2019 +
Update translations for torbirdy
---
tr/torbirdy.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd
index f7d7f0a8f..dec
commit 62eac164a31cd2f99683b386a918a9cf903af356
Author: Translation commit bot
Date: Fri Aug 9 22:18:56 2019 +
Update translations for tba-torbrowserstringsdtd_completed
---
tr/torbrowser_strings.dtd | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tr/torbrowse
commit 3eaf172e1b679a7fad9d83b1ad4bb8cc8823ca2a
Author: Translation commit bot
Date: Fri Aug 9 22:18:48 2019 +
Update translations for tba-torbrowserstringsdtd
---
tr/torbrowser_strings.dtd | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tr/torbrowser_strings.
commit 4d55874663a77b19454bfe8f1520f349cb196c15
Author: Translation commit bot
Date: Fri Aug 9 22:16:20 2019 +
Update translations for https_everywhere
---
tr/ssl-observatory.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tr/ssl-observatory.dtd b/tr/ssl-observa
commit 2df878c3d31cc0245b2341c5130683412be61ffc
Author: Translation commit bot
Date: Fri Aug 9 22:16:30 2019 +
Update translations for https_everywhere_completed
---
tr/ssl-observatory.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tr/ssl-observatory.dtd b/tr/s
commit d4b57fb1371154291fffac75fad0ba66e015561f
Author: Translation commit bot
Date: Fri Aug 9 22:15:59 2019 +
Update translations for donatepages-messagespot_completed
---
locale/tr/LC_MESSAGES/messages.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/locale/
commit 3c39828f04cbe70da96ffe4187d9b76abc8945e5
Author: Translation commit bot
Date: Fri Aug 9 22:15:51 2019 +
Update translations for donatepages-messagespot
---
locale/tr/LC_MESSAGES/messages.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/locale/tr/LC_MESS
commit 635da2812a5b25bc94629af80de8912ad3944ea3
Author: Translation commit bot
Date: Fri Aug 9 22:15:14 2019 +
Update translations for abouttor-homepage_completed
---
tr/aboutTor.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
i
commit 2d08e790a1b16ce3c900727c1f529b120333a5fa
Author: Translation commit bot
Date: Fri Aug 9 22:15:06 2019 +
Update translations for abouttor-homepage
---
tr/aboutTor.dtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index 8ddbe
commit f6d66a0a5da07ac7db60e95d9be601d302a74f8e
Author: Translation commit bot
Date: Fri Aug 9 21:51:44 2019 +
Update translations for support-portal_completed
---
contents+fr.po | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/contents+fr.po b/contents+fr.po
commit 3ad4358da03415b5e7fbd90d4a455da279e1a38f
Author: Translation commit bot
Date: Fri Aug 9 21:51:35 2019 +
Update translations for support-portal
---
contents+fr.po | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/contents+fr.po b/contents+fr.po
index b6e571
commit c35aded00a19f26f3124584e7d0f561cf579efec
Author: George Kadianakis
Date: Tue Mar 12 20:11:51 2019 +0200
Fix #28525 changes file that is breaking CI.
---
changes/bug28525 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/changes/bug28525 b/changes/bug28525
inde
commit fc89397fa9db3230c41004ba315ad1724540e46b
Merge: fb19d13f2 bad001080
Author: teor
Date: Sat Aug 10 07:26:30 2019 +1000
Merge branch 'maint-0.4.0' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://list
commit 654769bcec3e98bea5e3ac48b2aabffcbe55375e
Merge: 1ba2bd359 c8c2e2b8f
Author: teor
Date: Fri Aug 9 14:05:26 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5
changes/bug30781 | 4
src/feature/dirparse/routerparse.c | 3 +++
2 files c
commit e07d08a169c3dd43f4cd134c8f993c3f199c2bcc
Merge: e0f9a8222 0e0cf4abd
Author: teor
Date: Sat Aug 10 07:21:43 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9
changes/bug30561| 6 ++
src/common/compat.c | 17 +
2 files changed, 19
commit 1a9555e28352c0807527126a2e5b3fd6b95fe8a0
Merge: 6205810f8 08ddf1f62
Author: teor
Date: Fri Aug 9 13:53:52 2019 +1000
Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5
changes/bug28525 | 8
src/lib/net/address.c | 19 +++
src/test/test_
commit 5df0b36623005526588c35cb63b47dd256dcc5b7
Merge: 654769bce 254c1bac4
Author: teor
Date: Sat Aug 10 07:25:57 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.5
Delete src/or/buffers.c which was fixup'ed in 0.2.9 but moved in 0.3.5.
The 0.2.9 fix is not required for the
commit 519556ef2cb43b76967ea25372db093d41b6fc4a
Author: George Kadianakis
Date: Tue Mar 12 20:11:51 2019 +0200
Fix #28525 changes file that is breaking CI.
---
changes/bug28525 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/changes/bug28525 b/changes/bug28525
inde
commit bad00108087c4c34e34966fdeb01ae1e8bb14666
Merge: 8a4635a5f 5df0b3662
Author: teor
Date: Sat Aug 10 07:26:21 2019 +1000
Merge branch 'maint-0.3.5' into maint-0.4.0
changes/bug30561| 6 ++
src/lib/string/printf.c | 16 +---
2 files changed, 19 insertions(+), 3
commit 45f30ba5faf1c27fd8404c2fb95b1a79b9f59984
Merge: 05018d55c 63b404911
Author: teor
Date: Fri Aug 9 13:53:34 2019 +1000
Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9
changes/bug28525 | 8
src/common/address.c | 19 +++
src/test/test_ad
commit e0f9a8222b53772a6879ecddb41738a223e3b888
Merge: c35aded00 37bd7fa50
Author: teor
Date: Sat Aug 10 07:21:31 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9
changes/bug30041| 5 +
src/or/buffers.c| 4 +++-
src/or/connection.c | 4
3 file
commit 1ba2bd3599e94bb2fa533cde9e1ef296b4124ce4
Merge: e3ba9b7a7 8f0b29961
Author: teor
Date: Fri Aug 9 14:01:50 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5
changes/bug30561| 6 ++
src/lib/string/printf.c | 16 +---
2 files change
commit dfc64b5d60372a6de7f8a62458ddecd28bda8419
Merge: a9dab8310 fc89397fa
Author: teor
Date: Sat Aug 10 07:26:33 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists
commit 8a4635a5fe951dd9fa917eb670c8d3138b3d0b90
Merge: 7502881de fb3f46140
Author: teor
Date: Fri Aug 9 14:05:46 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0
changes/bug30781 | 4
src/feature/dirparse/routerparse.c | 3 +++
2 files c
commit 37bd7fa50d0901a87084b71299cc8c8786cd1cd8
Author: Nick Mathewson
Date: Tue Apr 9 13:14:28 2019 -0400
Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9
---
src/or/buffers.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/src/or/buffers.c b/src/or/buffers.c
commit 7667c1cbaffeb4c1df9241d80d84d27f3f9bde18
Merge: 8d22c09ab 878f44090
Author: teor
Date: Fri Aug 9 09:48:28 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1209' into
combined31343_31374_029
changes/bug31343| 9 +
src/or/channeltls.c | 23 +++
commit 254c1bac453fdb7d3e29a5cde9757542990a6989
Merge: e07d08a16 ba83c1e5c
Author: teor
Date: Sat Aug 10 07:21:56 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9
changes/bug30781 | 4
src/or/routerparse.c | 3 +++
2 files changed, 7 insertions(+)
commit dfdd877647ef496b2b4a82e8c1e6040692ecebb5
Merge: 48e990359 031ed59db
Author: teor
Date: Wed Apr 17 11:51:32 2019 +1000
Merge branch 'bug30184_029' into bug30184_034
"ours" merge, because 0.3.4 has a different set of changes,
which already compile.
commit 254c1bac453fdb7d3e29a5cde9757542990a6989
Merge: e07d08a16 ba83c1e5c
Author: teor
Date: Sat Aug 10 07:21:56 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9
changes/bug30781 | 4
src/or/routerparse.c | 3 +++
2 files changed, 7 insertions(+)
commit 65343a966e48e6eb49873f3cdb9a9f68bf72c70c
Merge: 4665ac9ec b560d94ac
Author: teor
Date: Fri Aug 9 09:49:35 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1222' into
combined31343_31374_035
changes/ticket31374| 4
src/lib/time/compat_time.c | 2 +-
2 files chang
commit 031ed59dbaf62d9cebd09f98f563c228fe6822f6
Author: teor
Date: Wed Apr 17 11:14:05 2019 +1000
test/relay: add a missing typedef
In 0.3.4 and later, these functions are declared in rephist.h:
STATIC uint64_t find_largest_max(bw_array_t *b);
STATIC void commit_max(bw_arra
commit c10011532e524846bce300a791f51f298b223f6a
Author: Nick Mathewson
Date: Tue Apr 9 12:03:22 2019 -0400
Changes file for bug30041
---
changes/bug30041 | 5 +
1 file changed, 5 insertions(+)
diff --git a/changes/bug30041 b/changes/bug30041
new file mode 100644
index 0..801c8
commit 8a4635a5fe951dd9fa917eb670c8d3138b3d0b90
Merge: 7502881de fb3f46140
Author: teor
Date: Fri Aug 9 14:05:46 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0
changes/bug30781 | 4
src/feature/dirparse/routerparse.c | 3 +++
2 files c
commit bad00108087c4c34e34966fdeb01ae1e8bb14666
Merge: 8a4635a5f 5df0b3662
Author: teor
Date: Sat Aug 10 07:26:21 2019 +1000
Merge branch 'maint-0.3.5' into maint-0.4.0
changes/bug30561| 6 ++
src/lib/string/printf.c | 16 +---
2 files changed, 19 insertions(+), 3
commit fb19d13f24306166c1dc078caeea2a5155638ac0
Merge: 53d5b67f0 7502881de
Author: teor
Date: Fri Aug 9 09:51:44 2019 +1000
Merge branch 'bug31343_31374_040' into bug31343_31374_041
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 7502881deb0ba702d2a6a2ea3d4d24cd998e8616
Merge: e609f0034 d4184fca3
Author: teor
Date: Fri Aug 9 09:51:40 2019 +1000
Merge branch 'bug31343_31374_035' into bug31343_31374_040
changes/ticket31374| 4
src/lib/time/compat_time.c | 2 +-
2 files changed, 5 insertions(+), 1
commit 6205810f8ed93c15f3f7be7fbb98d1cad15ae29c
Merge: d4184fca3 dfdd87764
Author: teor
Date: Fri Aug 9 13:50:59 2019 +1000
Merge remote-tracking branch 'tor-github/pr/958' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torpro
commit d4184fca30eedc8fdd82f87f34151a9e6558e176
Merge: 65343a966 2bc8989d8
Author: teor
Date: Fri Aug 9 09:51:35 2019 +1000
Merge branch 'bug31343_31374_029' into bug31343_31374_035
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 0fa95308fe5fcce8842530fcae5a49188856e6ac
Author: Tobias Stoeckmann
Date: Sun Mar 31 17:33:11 2019 +0200
Check return value of buf_move_to_buf for error.
If the concatenation of connection buffer and the buffer of linked
connection exceeds INT_MAX bytes, then buf_move_to_
commit 5df0b36623005526588c35cb63b47dd256dcc5b7
Merge: 654769bce 254c1bac4
Author: teor
Date: Sat Aug 10 07:25:57 2019 +1000
Merge branch 'maint-0.2.9' into maint-0.3.5
Delete src/or/buffers.c which was fixup'ed in 0.2.9 but moved in 0.3.5.
The 0.2.9 fix is not required for the
commit e609f003425ee9dff9bebbf4f5c683b8395a5c89
Merge: 0a661cde1 7e32db478
Author: teor
Date: Fri Aug 9 09:50:50 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040
changes/bug31343 | 9 +
src/core/or/channeltls.c | 20 +++
commit 37bd7fa50d0901a87084b71299cc8c8786cd1cd8
Author: Nick Mathewson
Date: Tue Apr 9 13:14:28 2019 -0400
Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9
---
src/or/buffers.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/src/or/buffers.c b/src/or/buffers.c
commit 05d25d06b62a9ee2cc77e44a66be2d9a95cae636
Author: teor
Date: Tue Apr 16 15:39:45 2019 +1000
rephist: fix an undeclared type compilation error
In 0.3.4 and later, we declare write_array as:
extern struct bw_array_t *write_array;
...
typedef struct bw_array_t bw_arr
commit 65343a966e48e6eb49873f3cdb9a9f68bf72c70c
Merge: 4665ac9ec b560d94ac
Author: teor
Date: Fri Aug 9 09:49:35 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1222' into
combined31343_31374_035
changes/ticket31374| 4
src/lib/time/compat_time.c | 2 +-
2 files chang
commit 684b396ce5c0a4d5ea70ec01a22d6d368819c873
Author: Nick Mathewson
Date: Thu Sep 20 14:34:44 2018 -0400
Remove another needless typedef
---
src/or/rephist.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/or/rephist.h b/src/or/rephist.h
index c464b34f7..d2f6c66df 100644
--- a/
commit 4665ac9ec70105f490ebd810e58281e0c8f03926
Merge: e83eabc9b a4400a77a
Author: teor
Date: Fri Aug 9 09:49:27 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1210' into
combined31343_31374_035
changes/bug31343 | 9 +
src/core/or/channeltls.c |
commit 05018d55cabdf9c0f80d6bf78ca30c795b60500e
Merge: 2bc8989d8 031ed59db
Author: teor
Date: Fri Aug 9 13:50:42 2019 +1000
Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9
src/or/rephist.h | 4 +---
src/test/test_relay.c | 2 ++
2 files changed, 3 insertions(+), 3 d
commit 3d04e0bf707ef55ced65966b61907962f8d9f8e4
Merge: 88276ee02 bad001080
Author: teor
Date: Sat Aug 10 07:26:26 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
changes/bug30561 | 6 ++
changes/bug30781 | 4
changes/bug31343
commit d4184fca30eedc8fdd82f87f34151a9e6558e176
Merge: 65343a966 2bc8989d8
Author: teor
Date: Fri Aug 9 09:51:35 2019 +1000
Merge branch 'bug31343_31374_029' into bug31343_31374_035
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 74b2bc43fbe61e3a04fe3f5cc9f817be307e13e1
Author: Tobias Stoeckmann
Date: Tue Apr 9 11:59:20 2019 -0400
Protect buffers against INT_MAX datalen overflows.
Many buffer functions have a hard limit of INT_MAX for datalen, but
this limitation is not enforced in all functions:
commit 2bc8989d833c3b583395380031e9b730d1c3fb37
Merge: 7667c1cba 3a280b35e
Author: teor
Date: Fri Aug 9 09:48:41 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1221' into
combined31343_31374_029
changes/ticket31374 | 4
src/common/compat_time.c | 3 +--
2 files changed,
commit c35aded00a19f26f3124584e7d0f561cf579efec
Author: George Kadianakis
Date: Tue Mar 12 20:11:51 2019 +0200
Fix #28525 changes file that is breaking CI.
---
changes/bug28525 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/changes/bug28525 b/changes/bug28525
inde
commit e0f9a8222b53772a6879ecddb41738a223e3b888
Merge: c35aded00 37bd7fa50
Author: teor
Date: Sat Aug 10 07:21:31 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9
changes/bug30041| 5 +
src/or/buffers.c| 4 +++-
src/or/connection.c | 4
3 file
commit 2bc8989d833c3b583395380031e9b730d1c3fb37
Merge: 7667c1cba 3a280b35e
Author: teor
Date: Fri Aug 9 09:48:41 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1221' into
combined31343_31374_029
changes/ticket31374 | 4
src/common/compat_time.c | 3 +--
2 files changed,
commit e609f003425ee9dff9bebbf4f5c683b8395a5c89
Merge: 0a661cde1 7e32db478
Author: teor
Date: Fri Aug 9 09:50:50 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040
changes/bug31343 | 9 +
src/core/or/channeltls.c | 20 +++
commit 45f30ba5faf1c27fd8404c2fb95b1a79b9f59984
Merge: 05018d55c 63b404911
Author: teor
Date: Fri Aug 9 13:53:34 2019 +1000
Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9
changes/bug28525 | 8
src/common/address.c | 19 +++
src/test/test_ad
commit e07d08a169c3dd43f4cd134c8f993c3f199c2bcc
Merge: e0f9a8222 0e0cf4abd
Author: teor
Date: Sat Aug 10 07:21:43 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9
changes/bug30561| 6 ++
src/common/compat.c | 17 +
2 files changed, 19
commit 1a9555e28352c0807527126a2e5b3fd6b95fe8a0
Merge: 6205810f8 08ddf1f62
Author: teor
Date: Fri Aug 9 13:53:52 2019 +1000
Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5
changes/bug28525 | 8
src/lib/net/address.c | 19 +++
src/test/test_
commit 7502881deb0ba702d2a6a2ea3d4d24cd998e8616
Merge: e609f0034 d4184fca3
Author: teor
Date: Fri Aug 9 09:51:40 2019 +1000
Merge branch 'bug31343_31374_035' into bug31343_31374_040
changes/ticket31374| 4
src/lib/time/compat_time.c | 2 +-
2 files changed, 5 insertions(+), 1
commit 05018d55cabdf9c0f80d6bf78ca30c795b60500e
Merge: 2bc8989d8 031ed59db
Author: teor
Date: Fri Aug 9 13:50:42 2019 +1000
Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9
src/or/rephist.h | 4 +---
src/test/test_relay.c | 2 ++
2 files changed, 3 insertions(+), 3 d
commit fb3f461406d9d22da3ce0b602409c6610b8bb4f7
Merge: 6a6f7eb67 c8c2e2b8f
Author: teor
Date: Thu Jun 6 09:56:50 2019 +1000
Merge branch 'bug30781_035' into bug30781_040
changes/bug30781 | 4
src/feature/dirparse/routerparse.c | 3 +++
2 files changed, 7 insertions(
commit 1ba2bd3599e94bb2fa533cde9e1ef296b4124ce4
Merge: e3ba9b7a7 8f0b29961
Author: teor
Date: Fri Aug 9 14:01:50 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5
changes/bug30561| 6 ++
src/lib/string/printf.c | 16 +---
2 files change
commit 6205810f8ed93c15f3f7be7fbb98d1cad15ae29c
Merge: d4184fca3 dfdd87764
Author: teor
Date: Fri Aug 9 13:50:59 2019 +1000
Merge remote-tracking branch 'tor-github/pr/958' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torpro
commit 654769bcec3e98bea5e3ac48b2aabffcbe55375e
Merge: 1ba2bd359 c8c2e2b8f
Author: teor
Date: Fri Aug 9 14:05:26 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5
changes/bug30781 | 4
src/feature/dirparse/routerparse.c | 3 +++
2 files c
commit bc9492a938f0bc2ee8dfb6f94f0f8d81f16b9575
Merge: 1dd952789 0849d2a2f
Author: Nick Mathewson
Date: Tue Aug 6 11:15:20 2019 -0400
Merge branch 'ticket31343_029' into ticket31343_035
changes/bug31343 | 9 +
src/core/or/channeltls.c | 24
2 file
commit c8c2e2b8fcc4d99adce600da8210a5e9ae653daf
Merge: e5deb2bbc dc8e3cd5c
Author: teor
Date: Thu Jun 6 09:55:44 2019 +1000
Merge branch 'bug30781_034' into bug30781_035
Moved fix from src/or/routerparse.c to src/feature/dirparse/routerparse.c.
changes/bug30781
commit cd6cb453720a5300d00d7996c5b3a03f054cd293
Author: Nick Mathewson
Date: Thu Aug 8 09:15:42 2019 -0400
Restore proper behavior of netinfo skew check
My previous fix removed a comparison, which would have caused us to
warn about every skew instead of skews of over an hour.
-
commit 4665ac9ec70105f490ebd810e58281e0c8f03926
Merge: e83eabc9b a4400a77a
Author: teor
Date: Fri Aug 9 09:49:27 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1210' into
combined31343_31374_035
changes/bug31343 | 9 +
src/core/or/channeltls.c |
commit dfdd877647ef496b2b4a82e8c1e6040692ecebb5
Merge: 48e990359 031ed59db
Author: teor
Date: Wed Apr 17 11:51:32 2019 +1000
Merge branch 'bug30184_029' into bug30184_034
"ours" merge, because 0.3.4 has a different set of changes,
which already compile.
commit 0d5a0b4f0ccc804913fbca20acf5fc62f52570b8
Author: Tobias Stoeckmann
Date: Wed May 29 09:33:24 2019 -0400
Fixed tor_vasprintf on systems without vasprintf.
If tor is compiled on a system with neither vasprintf nor _vscprintf,
the fallback implementation exposes a logic fla
commit 0849d2a2fdaeea2871f32bed35d410f19703aae1
Author: Nick Mathewson
Date: Tue Aug 6 11:11:06 2019 -0400
Avoid using labs() on time_t in channeltls.c
On some windows builds, time_t is 64 bits but long is not. This is
causing appveyor builds to fail.
Also, one of our
commit 7667c1cbaffeb4c1df9241d80d84d27f3f9bde18
Merge: 8d22c09ab 878f44090
Author: teor
Date: Fri Aug 9 09:48:28 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1209' into
combined31343_31374_029
changes/bug31343| 9 +
src/or/channeltls.c | 23 +++
commit 0e0cf4abd80249faa23f2bbdb89e62ba96c898f0
Author: Nick Mathewson
Date: Wed May 29 09:38:32 2019 -0400
Tweak comments in tor_vasprintf(), and add a changes file for 30651
---
changes/bug30561| 6 ++
src/common/compat.c | 10 ++
2 files changed, 12 insertions(+), 4 del
commit 8f0b29961eb4b9965f22bbcabdc0aa0354c19a4a
Merge: e5deb2bbc 0e0cf4abd
Author: Nick Mathewson
Date: Wed May 29 09:43:20 2019 -0400
Merge branch 'ticket30561_029' into ticket30561_035
changes/bug30561| 6 ++
src/lib/string/printf.c | 16 +---
2 files changed, 1
commit 519556ef2cb43b76967ea25372db093d41b6fc4a
Author: George Kadianakis
Date: Tue Mar 12 20:11:51 2019 +0200
Fix #28525 changes file that is breaking CI.
---
changes/bug28525 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/changes/bug28525 b/changes/bug28525
inde
commit dc8e3cd5ce2affb849ed07db8b4a7788769c5935
Merge: a521c4278 ba83c1e5c
Author: teor
Date: Thu Jun 6 09:53:02 2019 +1000
Merge branch 'bug30781_029' into bug30781_034
changes/bug30781 | 4
src/or/routerparse.c | 3 +++
2 files changed, 7 insertions(+)
_
commit 031ed59dbaf62d9cebd09f98f563c228fe6822f6
Author: teor
Date: Wed Apr 17 11:14:05 2019 +1000
test/relay: add a missing typedef
In 0.3.4 and later, these functions are declared in rephist.h:
STATIC uint64_t find_largest_max(bw_array_t *b);
STATIC void commit_max(bw_arra
commit 878f4409015f741c7075d0ccf3da794a6f313302
Author: Nick Mathewson
Date: Thu Aug 8 09:38:03 2019 -0400
Fix another time_t/long warning for 31343.
---
src/or/routerlist.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
commit 3a280b35ee45a1e4f4edaa3891a13d449d87fa8b
Author: Nick Mathewson
Date: Thu Aug 8 11:43:42 2019 -0400
Fix a warning about casting the results of GetProcAddress.
Fixes bug 31374; bugfix on 0.2.9.1-alpha.
---
changes/ticket31374 | 4
src/common/compat_time.c | 3 +--
commit b560d94ac0a9ccbc3db7b4a5611ef1ad4ee7628c
Merge: e83eabc9b 3a280b35e
Author: Nick Mathewson
Date: Thu Aug 8 11:46:24 2019 -0400
Merge branch 'ticket31374_029' into ticket31374_035
changes/ticket31374| 4
src/lib/time/compat_time.c | 2 +-
2 files changed, 5 insertions(+
commit 70d0b97ee67381d901ed350fc7fdb1e98e1975c6
Merge: bc9492a93 cd6cb4537
Author: Nick Mathewson
Date: Thu Aug 8 09:17:23 2019 -0400
Merge branch 'ticket31343_029' into ticket31343_035
___
tor-commits mailing list
tor-commits@lists.torproject
commit 0fa95308fe5fcce8842530fcae5a49188856e6ac
Author: Tobias Stoeckmann
Date: Sun Mar 31 17:33:11 2019 +0200
Check return value of buf_move_to_buf for error.
If the concatenation of connection buffer and the buffer of linked
connection exceeds INT_MAX bytes, then buf_move_to_
commit 79569d86b36ae1a89b5656bf8356247574b32e95
Merge: 2a42d6be2 bc9492a93
Author: Nick Mathewson
Date: Tue Aug 6 11:18:40 2019 -0400
Merge branch 'ticket31343_035' into ticket31343_040
changes/bug31343 | 9 +
src/core/or/channeltls.c | 20
2 files ch
commit 254c1bac453fdb7d3e29a5cde9757542990a6989
Merge: e07d08a16 ba83c1e5c
Author: teor
Date: Sat Aug 10 07:21:56 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9
changes/bug30781 | 4
src/or/routerparse.c | 3 +++
2 files changed, 7 insertions(+)
commit 684b396ce5c0a4d5ea70ec01a22d6d368819c873
Author: Nick Mathewson
Date: Thu Sep 20 14:34:44 2018 -0400
Remove another needless typedef
---
src/or/rephist.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/or/rephist.h b/src/or/rephist.h
index c464b34f7..d2f6c66df 100644
--- a/
commit 7e32db478b6619c8e25ad117a59361b1f5cdfa48
Merge: 79569d86b a4400a77a
Author: Nick Mathewson
Date: Thu Aug 8 09:40:04 2019 -0400
Merge branch 'ticket31343_035' into ticket31343_040
src/feature/nodelist/routerlist.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
_
commit ba83c1e5cf0e4ba0d63cb3728da059a9b241a161
Author: teor
Date: Thu Jun 6 09:12:14 2019 +1000
dirparse: Stop crashing when parsing unknown descriptor purpose annotations
We think this bug can only be triggered by modifying a local file.
Fixes bug 30781; bugfix on 0.2.0.
commit 1d9e1da6ee2a409f4a8f901969612fb679d12e89
Merge: cac7c6625 5df0b3662
Author: teor
Date: Sat Aug 10 07:26:16 2019 +1000
Merge branch 'maint-0.3.5' into release-0.3.5
changes/bug28525 | 7 +++
changes/bug30041 | 5 +
changes/bug30561
commit 05d25d06b62a9ee2cc77e44a66be2d9a95cae636
Author: teor
Date: Tue Apr 16 15:39:45 2019 +1000
rephist: fix an undeclared type compilation error
In 0.3.4 and later, we declare write_array as:
extern struct bw_array_t *write_array;
...
typedef struct bw_array_t bw_arr
commit 1a9555e28352c0807527126a2e5b3fd6b95fe8a0
Merge: 6205810f8 08ddf1f62
Author: teor
Date: Fri Aug 9 13:53:52 2019 +1000
Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5
changes/bug28525 | 8
src/lib/net/address.c | 19 +++
src/test/test_
commit 519556ef2cb43b76967ea25372db093d41b6fc4a
Author: George Kadianakis
Date: Tue Mar 12 20:11:51 2019 +0200
Fix #28525 changes file that is breaking CI.
---
changes/bug28525 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/changes/bug28525 b/changes/bug28525
inde
commit e0f9a8222b53772a6879ecddb41738a223e3b888
Merge: c35aded00 37bd7fa50
Author: teor
Date: Sat Aug 10 07:21:31 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9
changes/bug30041| 5 +
src/or/buffers.c| 4 +++-
src/or/connection.c | 4
3 file
1 - 100 of 323 matches
Mail list logo
