commit 5b04392c1553e2a3e278a48f8d0e071181c0444f
Merge: 0971b3ce4 e24195c7c
Author: Nick Mathewson
Date: Fri Sep 21 09:35:23 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug27316 | 3 +++
src/or/protover.c| 15 +++
src/test/test_protover.c |
commit 9697c2da4680267038d407093cbcbc4c68059904
Merge: 5a8827a4c c02f2d9eb
Author: Nick Mathewson
Date: Thu Sep 13 11:46:04 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug27658 | 6 ++
src/ext/tinytest.c | 12 ++--
2 files changed, 16 insertions(+), 2
commit 5a8827a4c98a354c775060f6c85c05a97c56e9b4
Merge: c3a750486 198b6354e
Author: Nick Mathewson
Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 3119cb5062e2cc7aee46c853a9c7373e6efdaaea
Merge: 8408331b3 19429fac2
Author: Nick Mathewson
Date: Tue Sep 11 12:04:55 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/geoip-2018-09-06 | 4 +
src/config/geoip | 49324
commit 8408331b3e965dfad3c79fadc51f0b01eed366fe
Merge: ec4a7641f b203dedaf
Author: Nick Mathewson
Date: Mon Sep 10 09:41:39 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
"ours" to avoid version bump.
___
tor-commits mailing
commit 36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0
Merge: cdaf9aec8 da29074fc
Author: Nick Mathewson
Date: Fri Sep 7 15:11:49 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
"ours" to avoid bump
___
tor-commits mailing list
commit 0366ae224cb3b9cd55905201cd1b55a03f2736e9
Merge: 987e12a58 1e46a391b
Author: Nick Mathewson
Date: Fri Sep 7 09:15:52 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug27344| 4
configure.ac| 1 +
src/common/tortls.c | 7 ++-
3 files changed, 11
commit 987e12a58f6ce9e0001413e665ac2aa92869af77
Merge: eacaff6cc 9fcb3ef78
Author: Nick Mathewson
Date: Fri Sep 7 08:46:45 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit a5ed62f96cafa1be251f9a7b4aafa519de4c2645
Merge: a08e6e711 912ae2b8d
Author: Nick Mathewson
Date: Fri Sep 7 08:44:39 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug27463| 3 +++
src/or/rendclient.c | 9 +
2 files changed, 12 insertions(+)
commit a08e6e711fbcd6a12818f1fe14739fc0e870434d
Merge: 57b207efa 1570f17f9
Author: Nick Mathewson
Date: Fri Sep 7 08:42:19 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug27465 | 5 +
src/common/address.c | 5 -
2 files changed, 9 insertions(+), 1
commit 57b207efa42e0a2794457cc7aff9c662d9000b44
Merge: 2b1b8bf2c ff1486385
Author: Nick Mathewson
Date: Wed Sep 5 10:15:42 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
.travis.yml | 2 +-
changes/bug27418 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --cc
commit 2b1b8bf2cad4af304d38f88e38047da7e0be
Merge: b40f9967f 4e4b6a247
Author: Nick Mathewson
Date: Wed Sep 5 09:56:19 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
.travis.yml | 6 +++---
changes/bug27453 | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
commit b40f9967fa31faa1dcf1a977989e235fbe836015
Merge: 70a07fa90 541b89b06
Author: Nick Mathewson
Date: Wed Aug 29 11:17:31 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
Makefile.am | 3 ++-
changes/bug27295 | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff
commit 36bb11a65081bb0c2a2a86359c6386bde67f8046
Merge: c1ad40627 cc4ea34a2
Author: Nick Mathewson
Date: Thu Aug 23 19:36:45 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug27185 | 3 +++
src/test/test.c | 10 ++
2 files changed, 5 insertions(+), 8 deletions(-)
commit c1ad40627bbccf2682f56053c77ff719c822cbce
Merge: a5bbe3f1d 9068e2fa2
Author: Nick Mathewson
Date: Wed Aug 22 09:37:31 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
src/or/connection_edge.c | 1 -
src/test/test_tortls.c | 3 +--
2 files changed, 1 insertion(+), 3
commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946
Merge: a29e9a901 05d62a3b7
Author: Nick Mathewson
Date: Tue Aug 21 20:03:46 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit d52f406001082474c3decf04747bf6f742b82c96
Merge: c798957b5 85a879234
Author: Nick Mathewson
Date: Tue Aug 21 19:16:40 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug27226 | 5 +++
src/common/tortls.c| 10 +++--
src/test/test_tortls.c | 119
commit a26a2735b9cf9c6940d784f755f983088c333833
Merge: 8982719f6 4c355ff18
Author: Nick Mathewson
Date: Wed Aug 15 12:20:57 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug27081 | 4
configure.ac | 6 --
2 files changed, 8 insertions(+), 2 deletions(-)
commit 8982719f6ac06383c26283b60acf6b3d3fde613e
Merge: 8e68fe7e1 fe19b40fe
Author: Nick Mathewson
Date: Thu Aug 9 08:47:24 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/geoip-2018-08-07 | 4 +
src/config/geoip | 14291
commit 8e68fe7e1c84e4ad513cd6b0af686a51c49e55cb
Merge: 4856a6e6c 27a2a6cb9
Author: Nick Mathewson
Date: Wed Aug 8 09:26:22 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug25440 | 5 +
src/common/sandbox.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c
Merge: fea35ddf0 42c6ebda1
Author: Nick Mathewson
Date: Fri Aug 3 07:33:45 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug20424_029_minimal | 4
configure.ac | 4
2 files changed, 8 insertions(+)
commit 78386d8cdd67ca9c00e77d5d8e6604c0841a7098
Merge: 559f79fd7 501deba8c
Author: Nick Mathewson
Date: Wed Jul 18 16:39:10 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
src/test/test_bt.sh | 2 ++
1 file changed, 2 insertions(+)
commit 312a42fc854a732d5f0fe4d5dcc1f567c2e069f4
Merge: 78386d8cd 93da2cae4
Author: Nick Mathewson
Date: Wed Jul 18 16:39:25 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug26787 | 3 +++
1 file changed, 3 insertions(+)
___
commit 559f79fd79b7c22caac2888f82e92307be02904a
Merge: 61a2762e3 a321d7240
Author: Nick Mathewson
Date: Wed Jul 18 15:03:27 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug26485| 4
src/or/config.c | 9 -
src/or/dirserv.c| 43
commit 61a2762e353f29b8b4402bf068e6268809174702
Merge: 98ee23ca1 6dafddd05
Author: Nick Mathewson
Date: Tue Jul 17 14:56:52 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug26830| 3 +++
src/test/test_keygen.sh | 8
2 files changed, 11 insertions(+)
commit 98ee23ca1e09cb6ac9e4b8e4bca67557ebb69906
Merge: 6ad2c2b92 cd4795ca3
Author: Nick Mathewson
Date: Thu Jul 12 14:32:16 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/task26771| 4
src/or/auth_dirs.inc | 4 ++--
2 files changed, 6 insertions(+), 2
commit 4a604d99382e4aad3df257e265c852f306f7bc7f
Merge: d3894dc34 8b53dfc36
Author: Nick Mathewson
Date: Mon Jul 9 10:14:43 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug26269 | 5 +
src/or/router.c | 15 +--
2 files changed, 14 insertions(+), 6
commit d3894dc34b66fc5090b674ff850071aaf319d1c8
Merge: a4e8f9450 9faa28b60
Author: Nick Mathewson
Date: Mon Jul 9 09:11:41 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/geoip-2018-07-03 |4 +
src/config/geoip | 7171
commit a4e8f945077b8eebbbd5be85f89b1631305ce1cc
Merge: e6366f787 b205714ba
Author: Nick Mathewson
Date: Tue Jul 3 09:48:03 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
changes/bug26535.029 | 5 +
src/test/ntor_ref.py | 9 ++---
2 files changed, 11 insertions(+), 3
29 matches
Mail list logo
