commit d97fd7f0762603702179bf2742e0fe5fc66bedbf
Merge: e26b3778d 768ffb8f4
Author: Nick Mathewson
Date: Fri May 15 10:25:27 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e26b3778ded828ae8499219f0862af1eb70c862a
Merge: 792dbff8f 72312cdbb
Author: Nick Mathewson
Date: Thu May 14 10:20:08 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
_
commit 792dbff8fb770ac69068fda525dc1538c31d69f1
Merge: 72c9d6dbf d41f1cd3e
Author: Nick Mathewson
Date: Wed May 6 17:18:46 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
src/feature/control/btrack_orconn_cevent.c | 1 +
1 file changed, 1 insertion(+)
___
commit 72c9d6dbf7b6396326dcd3f7cd8a144868a64e57
Merge: 6c333e8e0 633366efc
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug34078 | 5
src/app/config/confparse.c| 8 +++---
s
commit 6c333e8e0813dae18a0c5472249aad03f2cb27df
Merge: 73c4bdaad 28f453c47
Author: Nick Mathewson
Date: Wed May 6 16:47:03 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac | 16
src/core/proto/proto_socks.c | 5 -
commit 73c4bdaad517a8b8a344a6f523960eea7268192f
Merge: 1163d9a62 a02e86664
Author: Nick Mathewson
Date: Mon May 4 10:25:52 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug34077 | 3 +++
src/feature/dirauth/shared_random_state.c | 3 ++-
2 files
commit 1163d9a62fb40ecea50ff1279dcb55bcd7cced32
Merge: 23e401749 987f2fa50
Author: teor
Date: Thu Apr 9 11:03:24 2020 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket33491 | 6 ++
src/core/or/channel.c | 2 +-
src/core/or/dos.c | 4 ++--
src/core/or/dos.h
commit 23e401749ffb0676d30a52bbc80c94da5e4a8b65
Merge: 5ff42674e 26fd31fef
Author: Nick Mathewson
Date: Wed Mar 25 10:56:27 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
.appveyor.yml| 16 ++--
changes/bug33673 | 6 ++
2 files changed, 20 insertions(+), 2 d
commit 5ff42674e1c3d861a0ad128aea099293eda3c0f5
Merge: e05304902 42ea03eb7
Author: teor
Date: Fri Mar 20 11:24:48 2020 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.appveyor.yml | 2 +-
changes/ticket33643 | 5 +
changes/ticket33643_part2 | 3 +++
src/test/
commit e05304902c616c41b9520e2b7730e399401b68fe
Merge: 93ed011a2 cb69a5a11
Author: Nick Mathewson
Date: Wed Mar 18 12:18:31 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit 9bbf8c368f0f327281322f3a070bed1e1ca77604
Merge: 1b0322bb4 4ad3f17c2
Author: Nick Mathewson
Date: Wed Mar 18 08:20:16 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++
1 file changed, 7 insertions(+)
_
commit 80fb91d14ef3da236f6cd677c1ad338c03d1856a
Merge: 055c5732c 57b1d0848
Author: Nick Mathewson
Date: Tue Mar 17 15:22:36 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket33119| 8 +
src/feature/dirparse/parsecommon.c | 9 -
src/li
commit c1560f6513269c1d929f7bc98e1961d1afd23574
Merge: 6031aa45f cec647ff3
Author: Nick Mathewson
Date: Tue Mar 17 13:56:10 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket33619 | 5 +
src/core/or/circuitpadding.c | 9 ++---
2 files changed, 11 inse
commit 6031aa45fa8cd3b7b5666ae5915b552db35c0734
Merge: 4f2257477 5f4e14b8c
Author: Nick Mathewson
Date: Tue Mar 17 11:45:16 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/trove_2020_003 | 4
src/feature/hs/hs_client.c | 6 +++---
src/feature/hs/h
commit 4f2257477c2b35a25577b7b4fd50461811204a7d
Merge: 65187d9de c22696e36
Author: teor
Date: Mon Mar 16 20:54:24 2020 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 2 +-
changes/ticket32792 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit 65187d9de7b5a8696f439d633fcf2791dd346343
Merge: 386876971 7a9e2a261
Author: Nick Mathewson
Date: Fri Mar 13 16:57:42 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit 386876971447b12388582e6297069bfbdaf3e2d3
Merge: f141b861a b2e543bfe
Author: Nick Mathewson
Date: Fri Mar 13 16:46:16 2020 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug33093_logging | 5 +
src/lib/tls/buffers_tls.c | 4 ++--
2 files changed, 7 insertions(+), 2
commit f141b861a891f7c1ee70e4e53f8b44a060161810
Merge: 5c68a74ed c96cf1494
Author: teor
Date: Fri Mar 13 13:01:19 2020 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 57 -
changes/ticket33194 | 4
changes
commit 5c68a74ed9d4b880a0abb2e4a695c7932e3255fa
Merge: f9e73a923 5298113da
Author: teor
Date: Wed Feb 12 12:22:01 2020 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml| 2 --
changes/bug32753 | 3 +++
changes/ticket33075| 4
src/app
commit f9e73a923e0734cbffbc20cea75cf59fe059f53e
Merge: d2cbefbb8 0ff3e8f4a
Author: Nick Mathewson
Date: Tue Feb 11 08:53:41 2020 -0500
Merge branch 'maint-0.4.1' into release-0.4.1
scripts/maint/practracker/exceptions.txt | 1 -
1 file changed, 1 deletion(-)
_
commit d2cbefbb8f26a17742629251023e786f12a6f555
Merge: 06df2f51d 71c49f735
Author: Nick Mathewson
Date: Mon Feb 10 14:17:10 2020 -0500
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket33212 | 4
src/rust/protover/protover.rs | 2 +-
2 files changed, 5 insertions(
commit 06df2f51d793ada367a291a9770544b178db2239
Merge: de79264c1 7afb95d3e
Author: Nick Mathewson
Date: Thu Jan 30 11:19:55 2020 -0500
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit 3090839168377f17998cd9c4b7321aab7d9286c8
Merge: d211b20fb ec7f99e6e
Author: Nick Mathewson
Date: Wed Jan 29 19:44:48 2020 -0500
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit d211b20fbf80c03818d99e99d68e5ae8a3884295
Merge: 2be3b8275 6b392c333
Author: teor
Date: Thu Jan 30 07:55:09 2020 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug29819 | 8
changes/bug32778 | 3 +++
src/app/main/main.c | 4 ++--
src/
commit 2be3b8275062e34ef6a2c8d753a01b3137de739e
Merge: bdc870e6f fb541ffca
Author: teor
Date: Thu Jan 16 10:00:44 2020 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket32407 | 4
src/core/mainloop/mainloop.c | 4
src/lib/evloop/compat_libevent
commit bdc870e6f5e6eb25f40644614ab5ad4479c9cb9d
Merge: 8b685622f f5461a4bd
Author: Nick Mathewson
Date: Mon Jan 6 08:08:59 2020 -0500
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug32841 | 4
changes/bug32877 | 4
2 files changed, 4 insertions(+), 4 deletions(-)
_
commit 8b685622f843d1d450bf87356aa7055964421dd4
Merge: 69d7ea4db b9d81282e
Author: Nick Mathewson
Date: Mon Jan 6 08:06:54 2020 -0500
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug32877 | 4
src/lib/sandbox/sandbox.c | 1 +
2 files changed, 5 insertions(+)
commit 69d7ea4db963155e6133bc724d4639ea1bd31d1c
Merge: 7c2e1f6dd 723763787
Author: teor
Date: Fri Dec 20 10:12:47 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 10 --
changes/ticket32240 | 4
changes/ticket32242 | 2 ++
3 files changed, 10 i
commit 7c2e1f6ddd116eefc9f65f0536a5f3b1f5735966
Merge: 9fc50f057 ffccf6fc5
Author: teor
Date: Mon Dec 16 08:16:16 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 9 +
changes/ticket32629 | 4
2 files changed, 9 insertions(+), 4 deletions(-)
___
commit 9fc50f05741c8c1ce6005784a288c0c8b4654354
Merge: 0772f901b 7174a80ed
Author: Nick Mathewson
Date: Mon Dec 9 16:04:22 2019 -0500
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.
commit c030d2cbc0a2ede198e9772a372b5f211a062fb9
Merge: 247dbf891 6513102b9
Author: Nick Mathewson
Date: Fri Dec 6 16:02:08 2019 -0500
Merge branch 'maint-0.4.1' into release-0.4.1
changes/geoip-2019-12-03 | 4 +
src/config/geoip | 13933 ++--
commit 247dbf891f98b44b35062b871338bbe6efaf3c2b
Merge: cee30117c 8933c7908
Author: Nick Mathewson
Date: Thu Dec 5 13:33:05 2019 -0500
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.
commit 2ef4c04a92654cb5441d8b9ccba3c7a032145652
Merge: 82cef8032 cfa9cc34a
Author: teor
Date: Thu Dec 5 10:14:05 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31571| 7 +++
changes/bug31810| 4
src/lib/err/backtrace.c
commit 82cef8032b2a1d4c47c2e1f8ee540b3e04c0b05d
Merge: 28c05e0ec 14089a29b
Author: teor
Date: Tue Dec 3 12:46:54 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 14 +-
changes/ticket32500 | 5 +
2 files changed, 14 insertions(+), 5 deletions
commit 28c05e0ecfdd4b78af02b13df99eb45d5f077272
Merge: 108cd4965 26071aa3b
Author: teor
Date: Mon Nov 25 12:37:11 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug30344| 4
changes/bug31939| 3 +++
changes/bug32108|
commit 108cd4965e6c03d95964cbf391c9da68997d41f5
Merge: 06bbcbe45 29eb7b07e
Author: Nick Mathewson
Date: Mon Nov 11 10:14:04 2019 -0500
Merge branch 'maint-0.4.1' into release-0.4.1
changes/geoip-2019-11-06 | 4 +
src/config/geoip | 15751 +++
commit 06bbcbe45bc084e01746a37bab4fa9c19ae91786
Merge: fd31468ea 7043be968
Author: teor
Date: Mon Nov 11 14:19:51 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.appveyor.yml| 2 +-
changes/bug32449 | 5 +
2 files changed, 6 insertions(+), 1 deletion(-)
commit fd31468ea14c6c8f659833ae0398e931f95fb1b3
Merge: 13155e241 de6ceb0be
Author: teor
Date: Wed Nov 6 11:19:50 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31408| 5
changes/bug31837| 5
changes/bug31897| 3 +++
src/lib/fs/conf
commit 13155e241ec73a2f10e2029075972e87e33e82c9
Merge: 4eb55297d 63aff4a43
Author: teor
Date: Tue Oct 29 08:26:51 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 7 ---
changes/ticket32241 | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
___
commit 4eb55297d38cab682a7ccf0fcb6b15a9b8f85a4b
Merge: e188e02f2 63581d55a
Author: teor
Date: Fri Oct 25 10:56:10 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml| 12 ++--
changes/ticket31919_bionic | 5 +
2 files changed, 15 insertions(+)
commit e188e02f28b3732c6788e4136685dcec4caa027d
Merge: fd4fca378 8bc65cda4
Author: teor
Date: Wed Oct 23 10:00:41 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket31549 | 4 +++
src/feature/dirauth/process_descs.c | 59 +++
commit fd4fca378ceaf202f1b8fa6c0440a0bb4f716609
Merge: 0d88b9e8a 4a5c909ce
Author: teor
Date: Wed Oct 23 08:47:20 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.appveyor.yml| 6 +++---
.travis.yml | 6 --
changes/ticket31372_appveyor | 4 +++
commit 7664d6f518ea804e2bee942cfd15a8d4a9a724d3
Merge: e655744c8 d08d29f15
Author: Nick Mathewson
Date: Tue Oct 22 12:53:12 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug30916 | 4
src/feature/relay/router.c | 18 --
2 files changed, 1
commit 0d88b9e8a99235024cc5c3e31f024fe8eb9a20c3
Merge: 7664d6f51 3c071f300
Author: Nick Mathewson
Date: Tue Oct 22 12:54:43 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31107 | 4
src/core/or/channeltls.c | 10 +-
2 files changed, 13 insertions
commit e655744c802c30d5a7150035ce8c6f1c066f1a92
Merge: c476d30e8 b588b6087
Author: Nick Mathewson
Date: Tue Oct 22 12:51:33 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket31466 | 5 +
src/core/or/connection_edge.c | 6 --
2 files changed, 9 insert
commit c476d30e8e1052a502e2c35d9ec044006b261a07
Merge: c37f974b2 9769df89f
Author: Nick Mathewson
Date: Tue Oct 22 12:15:14 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31594| 5 +++
src/lib/err/backtrace.c | 2 +-
src/lib/err/torerr.c| 64
commit f954ae6883fcca3522e05fa24fb4b542ee62929c
Merge: 8bef3a76a d4dde249a
Author: Nick Mathewson
Date: Tue Oct 22 12:11:59 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31736 | 3 +++
src/app/config/config.c| 6 +-
src/fea
commit c37f974b2001dfb9a29a9070ad27de1b6467c3d1
Merge: f954ae688 c1bf4260b
Author: Nick Mathewson
Date: Tue Oct 22 12:13:55 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31614 | 9 +
src/lib/err/backtrace.c | 26 +++---
src/lib
commit 8bef3a76a917c879b0d675961953af0bbf5378cd
Merge: da1d900d3 6965798a1
Author: Nick Mathewson
Date: Tue Oct 22 12:10:30 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
.appveyor.yml| 12
changes/bug31884 | 3 +++
2 files changed, 15 insertions(+)
__
commit da1d900d3003e4db86b57b0ea747aa058545d438
Merge: a2f666aa2 4c8af10f0
Author: Nick Mathewson
Date: Tue Oct 22 12:08:53 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31898| 4
src/lib/dispatch/.may_include | 1 +
src/lib/dispatch/dispatch
commit a2f666aa2516049df7cf831d6d21d7ee5d1a68e4
Merge: 1bdab6819 2318bb237
Author: teor
Date: Tue Oct 22 20:48:16 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 12 +++-
changes/ticket32177 | 3 +++
2 files changed, 10 insertions(+), 5 deletions(-)
commit 1bdab681938d11bda40c700a99656f64add3f9aa
Merge: e5bce3a74 53aa15963
Author: Nick Mathewson
Date: Mon Oct 21 18:44:44 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
.appveyor.yml | 8
changes/ticket32086 | 3 +++
2 files changed, 7 insertions(+), 4 deletions
commit e5bce3a74eddf7a55f357664629b520ff3b6c05d
Merge: f33d5b29e 400e31ad1
Author: teor
Date: Thu Oct 17 14:52:10 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 87 +++--
changes/ticket30860 | 3 ++
changes/t
commit f33d5b29e62be0feb451acb8020e49b73bbf84b8
Merge: 124d8ec7b 4dcbbe416
Author: Nick Mathewson
Date: Wed Oct 2 08:01:34 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/geoip-2019-10-01 | 4 +
src/config/geoip | 35299 ++--
commit 124d8ec7b21e9afb4d2e6d739c267b7573cc740a
Merge: c752b1b43 6f3f93d86
Author: Nick Mathewson
Date: Thu Sep 19 08:52:59 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit 8136ebba26c08ef54d65ec46dcd4796bb8429b33
Merge: 84fc0c579 70bcff601
Author: Nick Mathewson
Date: Wed Sep 18 08:07:56 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket31772 | 4
src/feature/control/control_cmd.c | 4 +++-
2 files changed, 7 i
commit 84fc0c579b0ffa87b618cf533532d0c13e064c32
Merge: 077c71650 5f00c03ed
Author: Nick Mathewson
Date: Tue Sep 17 21:28:38 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31657| 5 +
src/feature/client/entrynodes.c | 3 ++-
src/test/test_entrynodes
commit 077c71650499f42cc720788e5cca0bf6cf55a18b
Merge: b8628ac2a c3e94a8cc
Author: Nick Mathewson
Date: Tue Sep 17 21:26:32 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/doc31089| 4 +
contrib/operator-tools/tor-exit-notice.html | 177 +
commit b8628ac2a7f1676e7321fe742efbdf75d903700a
Merge: cda7f4d8b a3342b382
Author: Nick Mathewson
Date: Tue Sep 17 19:12:19 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit ca5e2caf53bf678954d051d8dec469bf6eede0b9
Merge: a32646c2e c6f794326
Author: Nick Mathewson
Date: Tue Sep 17 19:05:04 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31570 | 5 +
src/lib/malloc/map_anon.c | 12 +++-
2 files changed, 16 inser
commit a32646c2ed8a19e5061df4b57d0c27efe6bc357d
Merge: c76907b54 50f981719
Author: Nick Mathewson
Date: Tue Sep 17 18:58:44 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket31673 | 3 +++
src/lib/meminfo/meminfo.c | 7 ---
2 files changed, 7 insertions(+),
commit c76907b54d2e49d4771aa079683ad75cd763b24d
Merge: ece35992a cec42be57
Author: Nick Mathewson
Date: Tue Sep 17 18:56:52 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket31687_1 | 4
changes/ticket31687_2 | 5 +
src/core/or/connection_ed
commit ece35992aca666cacbebf85686609fba923fb371
Merge: 6c3f339f0 ab74c3560
Author: Nick Mathewson
Date: Tue Sep 17 18:55:18 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31552| 5 +++
changes/bug31696| 5 +++
src/feature/dira
commit 6c3f339f05b8839a1a8a9c8a5af3e2ec9db6ab53
Merge: 215c3eef8 4596ead2f
Author: teor
Date: Thu Sep 5 14:48:05 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 215c3eef81466415d40f5224ed02db4ca7d1b454
Merge: 40797bd36 9dd908e71
Author: teor
Date: Thu Sep 5 12:05:56 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
Resolved modified/deleted conflict on changes/bug30649 by deleting
the file.
tor-github/pr/1282 mod
commit 51103450e4a997aa5a31cf9d60b3b22355525bd5
Merge: d6f3e2251 630bb113a
Author: David Goulet
Date: Wed Sep 4 08:33:27 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
Makefile.am | 2 +-
changes/ticket31554 | 4
2 files changed, 5 insertions(+), 1 deletion(-)
commit d6f3e225194cce776d2c3dc51be61cbc7ade65fb
Merge: 6bb876ccd e3a458e44
Author: Nick Mathewson
Date: Mon Sep 2 14:11:32 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug12399 | 3 +++
src/feature/rend/rendmid.c | 3 ++-
2 files changed, 5 insertions(+), 1 d
commit 6bb876ccd34f6df2a0550c8d8590bdd6d2ef78ed
Merge: 7b60368cc 25e7fc5b7
Author: teor
Date: Fri Aug 30 23:33:14 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 7b60368ccf1bc16d61db1868eece73178ae28e65
Merge: 561134610 ff905f8e1
Author: David Goulet
Date: Thu Aug 29 08:55:58 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug23507 | 5 +
changes/bug23818_v2| 6 ++
changes/bug23818_v3
commit 561134610f76420ac0f5bebbfc2c2dc65b7e89f3
Merge: ef2ba568d 5a73f369d
Author: George Kadianakis
Date: Tue Aug 27 11:49:36 2019 +0300
Merge branch 'maint-0.4.1' into release-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit ef2ba568db1a404bbbd0ea35b5b61888b785120e
Merge: 0e8c16e22 7c92f4faa
Author: Nick Mathewson
Date: Sat Aug 24 16:29:23 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 2 +-
changes/bug31463 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit 0e8c16e2298753a67d13fb26a2a9a457dabdd46a
Merge: 439ca4898 3b2a73207
Author: Nick Mathewson
Date: Tue Aug 20 11:17:06 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit b91126b5464f4bea366a5f771b01dfa95e121221
Merge: c5a68c185 ab92881d9
Author: Nick Mathewson
Date: Mon Aug 19 11:37:15 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit 7e6957d0d936cabd7cb8bee1d6fe06eb6603
Merge: 262f30dd3 6a89b0104
Author: Nick Mathewson
Date: Mon Aug 19 11:11:39 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31356_and_logs| 11 +
scripts/maint/practracker/exceptions.txt | 3 ++
src/c
commit 262f30dd339410c1a5a106fcb6e077b8d439e61e
Merge: 58c2b35b5 bba64c988
Author: Nick Mathewson
Date: Mon Aug 19 10:37:21 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket31406 | 3 +++
src/app/config/auth_dirs.inc | 2 +-
2 files changed, 4 insertions(+),
commit 58c2b35b5fb30579f60b970162a06236c8c2a4c2
Merge: dfc64b5d6 6eb5a811d
Author: teor
Date: Mon Aug 12 13:10:24 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 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 a9dab83106b38eed55cad9c53f20bb2e5237ef17
Merge: 6c83fe996 53d5b67f0
Author: Nick Mathewson
Date: Thu Aug 8 15:25:00 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket31374| 4
src/lib/time/compat_time.c | 2 +-
2 files changed, 5 insertions(+), 1 d
commit 6c83fe996ba280ebd9d8b57e1830428011cd96a1
Merge: 5c4ec3f33 0bc5b7ae9
Author: Nick Mathewson
Date: Thu Aug 8 11:24:08 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31343 | 9 +
src/core/or/channeltls.c | 20
commit 8ef4c78bd612edfc9ecbf7c8e92a2c337f32e932
Merge: b4a3e31fe 6d0883e9e
Author: teor
Date: Thu Aug 8 11:11:38 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lis
commit 5c4ec3f335da2fe983710a51754b77fed4c91d2d
Merge: 8ef4c78bd 40d7f1e3a
Author: teor
Date: Thu Aug 8 11:20:03 2019 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml | 8 +---
changes/ticket30591 | 3 +++
changes/ticket30694 | 3 +++
3 files changed, 11 inserti
commit 5a918ced20942e6d09f3cddc54bb7893f319b8ed
Merge: 53abbc784 21531f35f
Author: Nick Mathewson
Date: Tue Aug 6 09:19:11 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
Makefile.am | 9 ++---
changes/ticket31311 | 3 +++
2 files changed, 9 insertions(+), 3 deletions
commit 53abbc784e5ff377a4f64f47b9a9404228055719
Merge: 3c8a7cb54 74c059596
Author: Nick Mathewson
Date: Mon Aug 5 09:59:40 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug30942| 4
src/core/or/relay.c | 11 +++
2 files changed, 15 insertions(+)
_
commit 3c8a7cb54c2b1bccdf1326d9d5b962bb61a02167
Merge: 99bc2ac5a 1d6054f75
Author: David Goulet
Date: Mon Jul 29 12:02:54 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket31001 | 6 ++
src/lib/string/printf.c | 8
2 files changed, 10 insertions(+), 4
commit 99bc2ac5aa7070290a00f0af705ecc309e8bc9f7
Merge: 716c48c25 d8264ab62
Author: Nick Mathewson
Date: Thu Jul 25 21:52:16 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit 716c48c250ed74a1d83e5c1c2d95ddd395c07a7e
Merge: 5b31efe17 278e65887
Author: Nick Mathewson
Date: Thu Jul 25 20:11:47 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
src/test/test_status.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
___
commit 5b31efe174a90dfaae35824694c16f06287a689b
Merge: 6c4a6d170 6095bbf74
Author: Nick Mathewson
Date: Thu Jul 25 16:57:32 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
src/test/test_routerlist.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
__
commit 53ece8bd23f9f0d90c04d235c269cfdc3ecfb1e6
Merge: 530347972 af26cd610
Author: David Goulet
Date: Thu Jul 25 10:27:41 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31024 | 4
changes/bug31027 | 3 +++
src/core/or/circuitpadding.c |
commit 530347972d847f314c8f9e18c822e142d251bd4e
Merge: d62af7ae3 2a4b15697
Author: David Goulet
Date: Thu Jul 25 09:03:01 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31080_041 | 4 ++
src/feature/control/control_events.c | 2 +-
src/feature/contro
commit d62af7ae3f233fb62d0591b739edb9a1a149a05b
Merge: 08b3436ae b2a6b5282
Author: Nick Mathewson
Date: Thu Jul 25 09:01:38 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit b0a06e7b186f728a25c75743f30965b2ee46dc26
Merge: 634087304 bb33a2f29
Author: George Kadianakis
Date: Wed Jul 24 12:32:06 2019 +0300
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug31003 | 4
src/feature/nodelist/routerlist.c | 12 ++--
2 files
commit 63408730473df401c6610cad1e7aec63fd76ef76
Merge: f6c58d9f0 c541258fa
Author: David Goulet
Date: Tue Jul 23 09:39:51 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
.travis.yml| 24 +---
changes/chutney_ci | 3 +++
2 files changed, 20 insertions(
commit f6c58d9f0038bb5bd57d1e2abd384266fb9cd55f
Merge: 4ff083098 5e1660100
Author: Nick Mathewson
Date: Mon Jul 1 14:25:12 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket28795 | 5 +
src/app/config/fallback_dirs.inc | 567 ++--
commit 4ff08309866e62cd6ace83813843c95177f60433
Merge: 89ca35ff5 3ccf91027
Author: Nick Mathewson
Date: Wed Jun 26 10:06:02 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug30649 | 4
src/core/or/circuitpadding.c | 33 +++--
commit 89ca35ff54e21a172034652a9b152d4fc8103a54
Merge: 8c77a9444 648d5df62
Author: Nick Mathewson
Date: Wed Jun 26 09:51:32 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/ticket30871 | 6
scripts/maint/practracker/exceptions.txt | 4 +--
src/f
commit 8c77a9444afbc9944b15d94e388fd126c2a9b9ed
Merge: d13db36d8 00acccac6
Author: George Kadianakis
Date: Wed Jun 26 10:51:50 2019 +0300
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug30894 | 4
src/app/config/confparse.c | 1 +
2 files changed, 5 insertions(+)
commit d13db36d84a31bba9af845faac1edf4ffc7c7145
Merge: d2c360c53 e4f66bf7f
Author: Nick Mathewson
Date: Tue Jun 25 11:57:17 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
commit 0f6770826748d85f40cdfba08bdb298d0c02edca
Merge: ec2af981d 8803930de
Author: Nick Mathewson
Date: Mon Jun 24 13:36:47 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
changes/bug30956 | 4
doc/tor.1.txt | 6 --
src/feature/relay/router.c | 1
commit ec2af981dd47c305a94d3406f7ee17515ad1836e
Merge: d7460667a aab5f42ae
Author: Nick Mathewson
Date: Mon Jun 24 09:33:15 2019 -0400
Merge branch 'maint-0.4.1' into release-0.4.1
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig
99 matches
Mail list logo
