commit e2dde342b240039c9d4a254a2313fa9ab53d49d7
Merge: fa6296df3 a521c4278
Author: Nick Mathewson
Date: Fri May 17 08:10:16 2019 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/geoip-2019-05-13 | 4 +
src/config/geoip | 15407
commit fa6296df3afb6824f0610aabaef486c4b4b4c82c
Merge: 2afba291b cbce8dedd
Author: teor
Date: Fri Apr 19 12:00:36 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27199| 3 +++
changes/bug29017| 4
changes/bug29665| 7 +++
doc/tor.1.txt |
commit 2afba291bbfc79198e1cd62382a30168f45db4e5
Merge: b0428b6dc 48e990359
Author: teor
Date: Sat Apr 6 09:33:15 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
.travis.yml | 15 +++
Makefile.am | 4 +++-
changes/bug29036| 5 +
commit b0428b6dc7051a463de7bfd0b7f8a9d13a9d679f
Merge: 6c273d86e 3cfcfbac4
Author: Nick Mathewson
Date: Wed Apr 3 09:27:43 2019 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/geoip-2019-04-02 | 4 +
src/config/geoip | 10355
commit 6c273d86edd57b2b7203a2a4301123486394d1d0
Merge: 5600373e8 74775b2df
Author: teor
Date: Tue Apr 2 11:45:18 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug29703 | 4
1 file changed, 4 insertions(+)
___
commit 5600373e88ddd299be3e7043921cd36199620dc6
Merge: f8304cc6f 6d057c56f
Author: teor
Date: Wed Mar 27 10:02:36 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit f8304cc6fb82d3a6bf4029f0352497c5b80eb609
Merge: 1e154d7a1 ee43bc706
Author: George Kadianakis
Date: Tue Mar 26 01:25:11 2019 +0200
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket29806 | 7 +++
src/or/dirserv.c| 8 +++-
src/test/test_dir.c | 57
commit 1e154d7a156de68f41a52c067ba47fd38ce2a520
Merge: 547ee1c34 d7a5fdcb7
Author: teor
Date: Wed Mar 20 09:47:59 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug29706_minimal | 4
src/or/dirauth/shared_random_state.c | 4 ++--
commit 547ee1c345f7333402610e5464cf0c243c24aa36
Merge: 6a3421546 e021f89f3
Author: teor
Date: Thu Mar 14 06:56:43 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug23512| 6 +++
changes/bug25733| 4 ++
changes/bug27073| 4 ++
commit 6a342154607e6267b2cd5507f72843238846e543
Merge: 27c55d887 155b0f552
Author: Nick Mathewson
Date: Wed Mar 6 14:29:36 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/geoip-2019-03-04 | 4 +
src/config/geoip | 12163
commit 27c55d887432d5f54244954a9a85fb81017a420b
Merge: e143c4bcb f56645917
Author: teor
Date: Fri Mar 1 14:16:49 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit e143c4bcb128894a803c6adfb1a9d6137dd4398f
Merge: 5bbba3c94 6a61a020e
Author: teor
Date: Thu Feb 28 10:49:26 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
src/test/test_shared_random.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 5bbba3c9488c2184f822b270d6527a7ea898b16a
Merge: 6a930b442 524731503
Author: teor
Date: Thu Feb 28 10:45:52 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug29599 | 3 +++
src/test/test_shared_random.c | 5 +++--
2 files changed, 6 insertions(+), 2
commit 6a930b442c986af11a438dd25f3fd5002ec3879e
Merge: 635c59d55 1a194beb2
Author: teor
Date: Wed Feb 27 09:37:57 2019 +1000
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug29145| 3 +++
src/test/test-memwipe.c | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 635c59d553e420c4c54b95ac56b7d52f53a53111
Merge: 4fd31340f a56b9501f
Author: Nick Mathewson
Date: Thu Feb 21 13:25:39 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit ebda5be9556f482067403b74cc8698eb1f0bafbe
Merge: c19c726b7 506264791
Author: Nick Mathewson
Date: Thu Feb 21 10:08:14 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket29168 | 5 +
src/or/scheduler_kist.c | 2 +-
2 files changed, 6 insertions(+), 1
commit c19c726b750a0e15ef8db587bd05092366157522
Merge: adaf1d0b8 508002a4c
Author: Nick Mathewson
Date: Thu Feb 21 09:58:52 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit b1da8b86f0274d18fe6fe834be216a0690857699
Merge: d0f969a43 db209d4db
Author: Nick Mathewson
Date: Tue Feb 12 09:56:49 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/geoip-2019-02-05 | 4 +
src/config/geoip | 22020
commit d0f969a43708436e0e4c7181f0426b497649bc42
Merge: 6f22a0c15 8ea98c0f4
Author: Roger Dingledine
Date: Tue Feb 5 08:10:02 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug29244| 4
src/rust/Cargo.lock | 2 ++
2 files changed, 6 insertions(+)
commit 6f22a0c157fb6af1d05c7146d6d9539daf95b2c5
Merge: 001367eb1 1c5f03fba
Author: Nick Mathewson
Date: Wed Jan 23 09:51:02 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 001367eb13579332739694f82905c71f2e91a351
Merge: 33c8150dd 761f1bf71
Author: Nick Mathewson
Date: Fri Jan 18 12:25:08 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug29029 | 5 +
src/or/rendmid.c | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
commit 6fd998e2eebd9ce5bca67368eb71f4cc69504f40
Merge: 4f5ea89c1 41bb77822
Author: Nick Mathewson
Date: Mon Jan 7 21:18:47 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h
commit 4f5ea89c117c66def603bc6f4d046e2142a76467
Merge: 248056d9d ea47563dd
Author: Nick Mathewson
Date: Mon Jan 7 10:23:40 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h
commit 28c95ed3fa2e9205cd78c6dc5f5a021249f7b543
Merge: 366e9ba84 3d18903f5
Author: Nick Mathewson
Date: Mon Jan 7 08:43:45 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/geoip-2019-01-03 | 4 +
src/config/geoip | 12599
commit 366e9ba8425f602b978ffc1e8ba014913a2edd98
Merge: 79f929723 d7259b64d
Author: Nick Mathewson
Date: Fri Jan 4 15:04:58 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 79f929723f12ce414a17789966972f97032db255
Merge: f81078527 fe3331b84
Author: Nick Mathewson
Date: Fri Jan 4 14:57:06 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug28619| 6 ++
src/or/hs_service.c | 6 --
2 files changed, 10 insertions(+), 2
commit f81078527791b244c0200e53ac4862b36c21a1d9
Merge: 85526a5a1 d47c9276d
Author: Nick Mathewson
Date: Fri Jan 4 14:36:02 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27750 | 6 ++
src/or/main.c| 17 ++---
2 files changed, 12 insertions(+), 11
commit 85526a5a1f82eba726ba37e47954e16f6b753699
Merge: daf79d4b2 3e64553f7
Author: Nick Mathewson
Date: Thu Jan 3 09:02:39 2019 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket28973| 6 ++
src/common/tortls.c| 46
commit daf79d4b2a5f46ae4ffbdee7b39c504ccce33d6c
Merge: 2744f295a 2420e84ba
Author: Nick Mathewson
Date: Fri Dec 21 15:42:57 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket28912 | 6 ++
src/or/main.c | 17 ++---
2 files changed, 20
commit 2744f295a808f2141bad593dc6fe89a6a11a0a5e
Merge: 221db44c6 633813e31
Author: Nick Mathewson
Date: Tue Dec 11 10:00:22 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket24803 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 221db44c6b162a9e5bd2c1e1acf2e4efea7247ec
Merge: f1c58bbf4 6506b1ee9
Author: Nick Mathewson
Date: Tue Dec 11 09:41:05 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket24803 | 5 +
src/or/fallback_dirs.inc | 581
commit f1c58bbf42b5e4089552b57b9469208943464b46
Merge: 92fb9f934 c4f7953d8
Author: Nick Mathewson
Date: Thu Dec 6 09:26:33 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/geoip-2018-12-05 | 4 +
src/config/geoip | 10100
commit 92fb9f9342923891ce34eff0448406842e232532
Merge: 84b219757 e3a19b1c7
Author: Nick Mathewson
Date: Sat Dec 1 11:15:09 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug28554 | 3 +++
src/test/test_entrynodes.c | 5 -
2 files changed, 7 insertions(+),
commit 84b2197571b847b9100b300ee596f371547b0301
Merge: 79b40a910 36c323553
Author: Nick Mathewson
Date: Tue Nov 27 12:03:50 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
.appveyor.yml | 4 ++--
changes/ticket28574 | 4
2 files changed, 6 insertions(+), 2
commit 79b40a910f5ab09e5a8b30950b84026066b8ec8e
Merge: 8517e2d6e 9da8cd0bc
Author: Nick Mathewson
Date: Tue Nov 20 13:10:38 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
.appveyor.yml | 4 +++-
changes/ticket28459 | 4
2 files changed, 7 insertions(+), 1 deletion(-)
commit 8517e2d6e9cf1500a1cb531c3bcf49004045989e
Merge: 60bc9675d fe1fb4b0c
Author: Nick Mathewson
Date: Thu Nov 15 17:08:34 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket25573 | 5 +
src/common/container.c| 2 +-
src/common/container.h| 2 +-
commit 60bc9675da30e266f9d22e2db3db5adaaa73f6d0
Merge: 57ff37430 15e752e6b
Author: Nick Mathewson
Date: Thu Nov 15 16:56:11 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug24104| 4 ++
src/or/rephist.c| 7 ++-
src/or/rephist.h|
commit 57ff37430385a7f21e04071eb5805b1381ef7a42
Merge: 115fb2a84 63312e029
Author: Nick Mathewson
Date: Thu Nov 15 16:47:25 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket26913 | 7 +++
doc/tor.1.txt | 6 --
src/or/config.c | 21
commit 115fb2a8440d9b5f84bd84525aaf9cd6a4bfab9d
Merge: d94715e2d 1e6ffeaea
Author: Nick Mathewson
Date: Thu Nov 15 16:37:41 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket27550| 5 +
src/or/directory.c | 2 +-
src/or/hs_client.c | 4
commit d94715e2d0c34f9bb9c4871167e79b06750513a1
Merge: f41374b03 27b917047
Author: Nick Mathewson
Date: Thu Nov 15 09:06:18 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
.appveyor.yml| 21 +
changes/bug28399 | 4
changes/bug28454 | 4
3
commit f41374b035cc1e605db5a82ede6b391c9cdcd0a0
Merge: 6b2c1d62a 1043532a5
Author: Nick Mathewson
Date: Wed Nov 14 07:55:07 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug28419 | 3 +++
src/tools/tor_runner.c | 3 ++-
2 files changed, 5 insertions(+), 1
commit 6b2c1d62a5bb590f35779dd26ced00d41938cdb5
Merge: 73378e9ac 42be1c668
Author: Nick Mathewson
Date: Tue Nov 13 08:27:29 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug28413 | 4
src/common/aes.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
commit 73378e9ac1039539d7c510a22aa839f399ee5603
Merge: 8714e98e8 1fce9d129
Author: Nick Mathewson
Date: Sun Nov 11 18:05:45 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
src/common/tortls.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8714e98e88627cda6bbbfa6103147373695c91f9
Merge: 3ce2d8c4a 6b2ff4fff
Author: Nick Mathewson
Date: Sun Nov 11 11:57:53 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/geoip-2018-11-06 | 4 +
src/config/geoip | 22164
commit 3ce2d8c4adb15268c330264cbd4113294a02c8ad
Merge: 336f1fad3 591a189fa
Author: Nick Mathewson
Date: Fri Nov 9 10:49:47 2018 -0500
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug28245| 6 ++
configure.ac| 1 +
src/common/tortls.c | 17 +
3
commit 336f1fad325d3af022b348e55a8ba33aa770f987
Merge: 4ac3ccf28 5acf6f871
Author: Nick Mathewson
Date: Fri Nov 2 13:02:02 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h
commit a6240d578efcd381fb89974211a52121bc823c4a
Merge: d3769dd4d d8d4fe83d
Author: Nick Mathewson
Date: Fri Nov 2 09:09:01 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h
commit d3769dd4d01f282b4ad907de8b48b67f18102f79
Merge: 1c5e7430e bfe8f50cc
Author: Nick Mathewson
Date: Fri Nov 2 09:06:37 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug26470 | 4
src/or/connection_edge.c | 5 -
2 files changed, 8 insertions(+), 1
commit 1c5e7430efbc3bb03596957d454c9ff6825de67b
Merge: 1ace56149 f288f2478
Author: Nick Mathewson
Date: Fri Nov 2 09:05:18 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug26896 | 3 +++
src/or/directory.c | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 1ace56149546e7f99a205b14e5086f8924102ae5
Merge: e160fc57f 8ed4f1ee8
Author: Nick Mathewson
Date: Fri Nov 2 09:04:25 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket27410 | 5 +
src/or/hs_client.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit e160fc57f10da547982475b2d7dcabd594252e48
Merge: 9d9b8a5a0 158db532e
Author: Nick Mathewson
Date: Wed Oct 31 11:01:41 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27948| 6 ++
src/test/bt_test.py | 10 ++
2 files changed, 12 insertions(+), 4
commit 9d9b8a5a06dd25a91f41c49398b18fc9f5064656
Merge: c0d1ba2e9 cf2cb783b
Author: Nick Mathewson
Date: Tue Oct 30 09:34:04 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27741 | 5 +
src/rust/protover/ffi.rs | 13 -
2 files changed, 9
commit c0d1ba2e9488ad7af19688d5357a2b1437b3f816
Merge: a7cd5cea6 c4b6b5738
Author: Nick Mathewson
Date: Mon Oct 29 15:57:31 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug28202 | 4
src/or/parsecommon.c | 3 +--
src/or/routerparse.c | 7 +++
3 files
commit a7cd5cea6df23a4c639da8928e49862e6dd52419
Merge: 274ef2637 b063ca060
Author: Nick Mathewson
Date: Wed Oct 24 12:55:36 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket27797 | 5 +
src/or/nodelist.c | 5 +
2 files changed, 10 insertions(+)
commit 274ef2637fc09444212147bcd625c6a16eae0765
Merge: 271144c99 fd6078b33
Author: Nick Mathewson
Date: Tue Oct 23 19:54:16 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
src/rust/protover/ffi.rs | 1 -
1 file changed, 1 deletion(-)
commit 271144c99e00d0596d3a8f7e2c278f2b2789c115
Merge: 64f363737 7edc594ee
Author: Nick Mathewson
Date: Tue Oct 23 19:18:23 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27740 | 4
changes/bug27804 | 3 +++
src/rust/protover/ffi.rs | 10
commit 64f36373735c6feee44647cf990d663960156511
Merge: 8400bccb1 d1eac7830
Author: Nick Mathewson
Date: Thu Oct 18 09:12:58 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27800 | 4
src/or/nodelist.c| 37 +
commit 8400bccb165d6786085566fd1fbe5e65505298f3
Merge: f8aad4a54 2000d04cb
Author: Nick Mathewson
Date: Wed Oct 17 13:02:23 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket28089 | 6 ++
src/or/connection.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit f8aad4a5486b3adb53d07eb74e912f9c92d63b00
Merge: bf1635d8c b5731cdf2
Author: Nick Mathewson
Date: Tue Oct 16 18:05:58 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket27849 | 5 +
src/or/main.c | 7 ++-
2 files changed, 11 insertions(+), 1
commit bf1635d8cf292b5d589e991a92a3c8f09ec32e51
Merge: c8a7b7b58 38599de2d
Author: Nick Mathewson
Date: Tue Oct 16 08:04:34 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/ticket27810| 5 +
src/test/test_hs_service.c | 4 ++--
2 files changed, 7
commit c8a7b7b585d46a5504b764a71ae9d17edf8c3b20
Merge: 35fbec371 633e99575
Author: Nick Mathewson
Date: Mon Oct 15 12:52:54 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
src/or/hs_intropoint.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 35fbec3719682197130d506e758cab2ce640ef7e
Merge: 7e9f1d699 d1ec7bb06
Author: Nick Mathewson
Date: Mon Oct 15 12:47:46 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
src/common/util_bug.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 294f5bb7e4ee8d07c1848196917e536c2432822f
Merge: 092190476 fd528a088
Author: Nick Mathewson
Date: Mon Oct 15 10:37:52 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27709 | 4
src/common/util_bug.h | 57
commit 7e9f1d6992fd815c973049ed621daacf16ff0201
Merge: 294f5bb7e 3462f8ed6
Author: Nick Mathewson
Date: Mon Oct 15 10:48:35 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
src/common/util_bug.h | 7 ++-
src/or/hs_common.c| 7 +++
2 files changed, 9 insertions(+), 5
commit 09219047631c4375c20a6b60d14dfed108bec895
Merge: 70624a3be ffaf180b7
Author: Nick Mathewson
Date: Wed Oct 10 17:12:34 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.travis.yml | 51 ++-
changes/ticket27738 | 4
commit 70624a3be76ccde46d4ecabc4849613098bd019e
Merge: 131025232 48182c147
Author: Nick Mathewson
Date: Wed Oct 10 14:27:27 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.appveyor.yml | 150 ++--
changes/tickets_27765_27943
commit 1310252326281ff5ce22dc9a73a53ab424bb169b
Merge: 7001162b8 e5fe8b0e3
Author: Nick Mathewson
Date: Wed Oct 10 11:34:49 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/geoip-2018-10-09 | 4 +
src/config/geoip | 38518
commit 7001162b8e7a74573ea7196f09e46c8dce611a95
Merge: 08aaedb01 f57d8722e
Author: Nick Mathewson
Date: Mon Sep 24 11:10:38 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27781 | 4
src/common/aes.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 08aaedb0151684c31ace7ecabc9184b7cc018352
Merge: 4149b1554 e818a7190
Author: Nick Mathewson
Date: Fri Sep 21 09:35:54 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27316 | 3 +++
src/or/protover.c| 17 -
commit 4149b15540a763e6bee1d9aa0f7776701b925bca
Merge: 3384638c6 163230e24
Author: Nick Mathewson
Date: Thu Sep 20 10:43:08 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27139 | 14 ++
src/common/compat_time.c | 22 --
commit 3384638c6d7dfe18c64066bd9916d46166223478
Merge: c1e020636 2ddbaf9cd
Author: Nick Mathewson
Date: Tue Sep 18 08:31:14 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27206| 4 +++
src/rust/protover/protoset.rs | 49
commit c1e0206365bbd0210b149357aec5ec054155539f
Merge: 1ab85566d 6f47734ea
Author: Nick Mathewson
Date: Fri Sep 14 12:56:30 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27335| 4
src/or/hs_service.c | 6 +++---
2 files changed, 7 insertions(+), 3
commit 1ab85566d8cb8707ea29ab02b10edf2da5cfb1ca
Merge: bd4c50f36 8f689e0eb
Author: Nick Mathewson
Date: Fri Sep 14 10:48:01 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27708 | 4
src/or/config.c | 1 +
2 files changed, 5 insertions(+)
commit bd4c50f36b366f61f18769c17e17d77d75891465
Merge: 5e94c9384 82b128277
Author: Nick Mathewson
Date: Fri Sep 14 09:25:34 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27687 | 4
src/rust/protover/errors.rs | 3 +++
commit 5e94c9384197f75b6007e3de1c833912fe8ecb6a
Merge: 04f210811 3ddfd5ff2
Author: Nick Mathewson
Date: Thu Sep 13 11:46:04 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27658 | 6 ++
src/ext/tinytest.c | 12 ++--
2 files changed, 16 insertions(+), 2
commit 04f210811e1ea32abdd4d610c01db0ad084d6952
Merge: 204a90c93 f8d5fb42a
Author: Nick Mathewson
Date: Wed Sep 12 17:24:41 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27649| 4
src/rust/protover/protoset.rs | 17 -
commit 204a90c935dc8fe4f84c311b09e3481d67c2966d
Merge: 80b13f7e1 73ba308d3
Author: Nick Mathewson
Date: Wed Sep 12 08:17:45 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.appveyor.yml| 2 +-
changes/bug27464 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit 80b13f7e1e637390e7cde5695800e6a16f4f08fa
Merge: 337204915 affbe376f
Author: Nick Mathewson
Date: Tue Sep 11 15:53:06 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug25505| 3 +++
src/or/channelpadding.c | 9 +++--
2 files changed, 10 insertions(+),
commit 337204915479dab7057f73319866bfa63205c58e
Merge: f59b10750 89c5b8d7d
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.travis.yml | 27 +--
changes/ticket27252 | 6 ++
commit f59b10750e4e98550a9d5e05f18f6dd92ba7198e
Merge: fe0c42631 8a873a569
Author: Nick Mathewson
Date: Tue Sep 11 12:04:56 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/geoip-2018-09-06 | 4 +
src/config/geoip | 49324
commit fe0c42631750aa40f66e34f829a04ddfce83fe10
Merge: da95b9135 96601a680
Author: Nick Mathewson
Date: Mon Sep 10 09:42:57 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit cf6318f6857a3e91010cf9860fdd85fc18527c15
Merge: 6f48b70f6 0d5aaef46
Author: Nick Mathewson
Date: Fri Sep 7 15:14:03 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 0b50ca565d027606aa247a6ec7f85429f3f50543
Merge: eca4c39a4 fa38bbb70
Author: Nick Mathewson
Date: Fri Sep 7 09:49:53 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h
commit 0330652346ed47863710454d3dccdc1b5109d53c
Merge: 85cee6a74 8849b2ca3
Author: Nick Mathewson
Date: Fri Sep 7 09:15:56 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27344| 4
configure.ac| 1 +
src/common/tortls.c | 7 ++-
3 files changed,
commit 85cee6a749128b926cd727a5c0f2e516a260eb41
Merge: b36f128ce 967cef2f8
Author: Nick Mathewson
Date: Fri Sep 7 08:48:23 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.appveyor.yml| 4 +++-
changes/bug27460 | 6 ++
2 files changed, 9 insertions(+), 1 deletion(-)
commit b36f128cee5520ac37acafa0459c9bf14dedad5a
Merge: 17511b0dc a78504dbe
Author: Nick Mathewson
Date: Fri Sep 7 08:46:45 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27461 | 5 +
src/or/main.c| 8
2 files changed, 13 insertions(+)
commit 17511b0dca8d2ef7e579b529c47f07a00b1b2d74
Merge: 4d0abd1b9 a4930de5e
Author: Nick Mathewson
Date: Fri Sep 7 08:44:40 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27463| 3 +++
src/or/rendclient.c | 9 +
2 files changed, 12 insertions(+)
commit 4d0abd1b9b0478a8b25cf4b789fe371eea69f952
Merge: 444fd5704 b6de39e5f
Author: Nick Mathewson
Date: Fri Sep 7 08:42:19 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27465 | 5 +
src/common/address.c | 5 -
2 files changed, 9 insertions(+), 1
commit 444fd57044c12f2f89d66940078b4c8397b55e8a
Merge: b1350d279 2b0416366
Author: Nick Mathewson
Date: Wed Sep 5 10:16:10 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.travis.yml | 2 +-
changes/bug27418 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit b1350d27977c0fa57c351a18e630a1e20fb70a08
Merge: c7ca7a938 b390983b2
Author: Nick Mathewson
Date: Wed Sep 5 10:01:31 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.appveyor.yml | 15 ++-
changes/ticket27430 | 4
changes/ticket27449 | 3 +++
3
commit c7ca7a93807cc2cae7b8369ebc1fb0682291bd1b
Merge: c41944d06 4ab033c3b
Author: Nick Mathewson
Date: Wed Sep 5 09:56:19 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.travis.yml | 6 +++---
changes/bug27453 | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
commit c41944d06aaba7899ff3e2bb1a97f859e849d2eb
Merge: a7a900685 0ea622aa3
Author: Nick Mathewson
Date: Wed Aug 29 11:17:31 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
Makefile.am | 3 ++-
changes/bug27295 | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
commit a7a900685db464702b00d706c0688d53d8400f4a
Merge: f5fea5934 0483f7f64
Author: Nick Mathewson
Date: Mon Aug 27 09:39:08 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27345| 5 +
src/test/include.am | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit f5fea59342a5c7fb8129d5157e5e5ceead9ac6ef
Merge: 8465a8d84 4c1c818ff
Author: Nick Mathewson
Date: Fri Aug 24 16:50:32 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 86409ec247f167aa6a3d123672f03a7dbfb3d011
Merge: eb7596672 658171318
Author: Nick Mathewson
Date: Fri Aug 24 12:35:26 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/27286| 4
src/or/dirauth/dirvote.c | 8
2 files changed, 8 insertions(+),
commit eb75966720a15b89b0f6a814c4e1d8446479db08
Merge: 8a4b41f24 dd27e17cc
Author: Nick Mathewson
Date: Fri Aug 24 12:05:39 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
src/or/nodelist.c | 52
1 file changed, 36
commit d911eb80f69dc6a63a85785e813bfd24290dc429
Merge: 49542ff72 4748fd23d
Author: Nick Mathewson
Date: Fri Aug 24 09:13:51 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 49542ff72432b408aa1291d045b1deb5f6af139f
Merge: 5c3998a02 588c77677
Author: Nick Mathewson
Date: Fri Aug 24 08:32:33 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
src/or/nodelist.c | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
commit 5c3998a02773af87a27265bf9e4d936cc07cc9d1
Merge: 1b5c9a580 d0007db1f
Author: Nick Mathewson
Date: Thu Aug 23 20:44:16 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug26979| 4 ++
scripts/test/appveyor-irc-notify.py | 83
commit 1b5c9a580879fe2836e70605f435949cfc6c23ba
Merge: b63d157b4 90f6c590a
Author: Nick Mathewson
Date: Thu Aug 23 20:07:47 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.appveyor.yml | 3 ---
changes/ticket27275 | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
1 - 100 of 157 matches
Mail list logo
