commit 6fed66d268fa84bff7c68eb549907546b66ca6f8
Merge: a4e8f9450 12258bbb9
Author: David Goulet
Date: Tue Jul 3 13:31:08 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
___
tor-commits mailing list
tor-commits@lists.torproject.org
https
commit 3c97b148a42f6863ccf4b950967ce345d2fc8cbe
Merge: ed84dab8b 2968c716d
Author: Nick Mathewson
Date: Fri Jun 29 23:12:03 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
scripts/maint/checkSpace.pl | 5 -
1 file changed, 5 deletions(-)
commit ed84dab8b4cd691dcdc0fecfb9c451bb0ffd930a
Merge: 6e9d5fc4e a3ec89a4f
Author: Nick Mathewson
Date: Fri Jun 29 13:49:43 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
src/test/test_channelpadding.c | 1 +
src/test/test_hs_descriptor.c | 3 +++
src/test/test_shared_random.c |
commit 68dfbd5ef433b830059baa08d48589518db05d22
Merge: fe2588a5a ea14d3408
Author: Nick Mathewson
Date: Fri Jun 29 13:06:15 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/ticket26467| 3 +++
src/or/directory.c | 1 +
src/or/hs_descriptor.c
commit fe2588a5a8560c8cb03345b3caaaf906655c34a1
Merge: 25226fb26 1385a5118
Author: Nick Mathewson
Date: Fri Jun 29 13:00:56 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
src/or/routerlist.c | 2 ++
src/or/shared_random_state.c | 1 +
src/test/test_hs.c| 7 +
commit 25226fb260a6b5f93187b707ec35f06637fbe710
Merge: 6107a2127 d6d3f8486
Author: Nick Mathewson
Date: Tue Jun 26 09:21:59 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/feature26372_029 | 4
configure.ac | 6 +-
2 files changed, 9 insertions(+), 1 de
commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa
Merge: 7e7585d0a 340fcc7e2
Author: Nick Mathewson
Date: Sun Jun 17 19:24:48 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
.editorconfig | 33 +
1 file changed, 33 insertions(+)
commit 7e7585d0a193f8ac368705d7028ec4b241fc2afe
Merge: 6017447e3 9713ecfc4
Author: Nick Mathewson
Date: Wed Jun 13 09:59:28 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug26158 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6017447e3ae8f3cd53c7c6fff1f8660c29affde4
Merge: ff70cc84f 94f300762
Author: Nick Mathewson
Date: Wed Jun 13 09:58:04 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug26158 | 5 +
src/or/circuitbuild.c | 1 +
2 files changed, 6 insertions(+)
___
commit 53513e4bfed4c6713509f239cad94ca5b4995246
Merge: 5d8a927aa 16381b579
Author: Nick Mathewson
Date: Tue Jun 12 09:44:17 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/ticket26343 | 3 +++
src/or/auth_dirs.inc | 1 +
2 files changed, 4 insertions(+)
commit 5d8a927aa35c01c59dcf137827db27b92d034498
Merge: 74ac463e7 d84581a3e
Author: Nick Mathewson
Date: Tue Jun 12 08:18:56 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug26272 | 3 +++
src/common/compress_zstd.c | 2 ++
2 files changed, 5 insertions(+)
__
commit 74ac463e7fb806e5abf48be788daf03c40e930ad
Merge: dd63033fc 19f386852
Author: Nick Mathewson
Date: Tue Jun 12 08:11:20 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/geoip-2018-06-07 |4 +
src/config/geoip | 5848 +--
commit dd63033fcbb960ac563a8f417a7f65e62781d9a9
Merge: 3f3739c6e 1ef8023e0
Author: Nick Mathewson
Date: Fri Jun 8 10:11:57 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug26196 | 4
src/or/protover.c | 13 +
2 files changed, 17 insertions(+)
___
commit 3f3739c6e064fd5e1c2ac89bfd49fed7a622ac68
Merge: 8340f641c f48fb8a72
Author: Nick Mathewson
Date: Thu May 24 09:40:06 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug26116 | 7 +++
src/common/crypto.c| 7 ++-
src/test/test_crypto.c | 41
commit 8340f641c30f8e529b513732be2c931e128227e2
Merge: 4aa3d511b d3a972561
Author: Nick Mathewson
Date: Wed May 16 12:11:45 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug26072 | 5 +
src/or/relay.c | 1 +
2 files changed, 6 insertions(+)
_
commit 4aa3d511b25fe99579d7810418433eef46e417da
Merge: 7ee67c47f 502d2c006
Author: Nick Mathewson
Date: Tue May 15 09:32:44 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/geoip-2018-05-01 |4 +
src/config/geoip | 5455 ++-
commit 7ee67c47fae2263e8c4f5599e0fbba6531738120
Merge: 15b8c860d 2d61a8351
Author: Nick Mathewson
Date: Thu May 10 09:22:32 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug26069 | 5 +
src/or/hs_descriptor.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(
commit 15b8c860d3c8eac8f560569a90e90ba517e1c6ae
Merge: e5acbbd16 ba7043921
Author: Nick Mathewson
Date: Thu May 10 09:19:28 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
src/test/test_dir.c | 20
1 file changed, 20 insertions(+)
__
commit e5acbbd16d29a5d3187bf2867c4ffa15451669bb
Merge: 394f102ea aa08c1970
Author: Nick Mathewson
Date: Thu May 10 08:02:10 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/ticket26062| 3 +++
src/or/networkstatus.c | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
commit be5b4415c2dce243a6249e6ca14b65423c9b0746
Merge: 246765342 6361a250f
Author: Nick Mathewson
Date: Thu May 3 13:38:54 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
.travis.yml | 4 +++-
Makefile.am | 9 +
2 files changed, 12 insertions(+), 1 deletion(-)
_
commit 246765342e681ae6f8c35709f9acd9a78d7048d2
Merge: 7c3f87eb4 993e314c6
Author: Nick Mathewson
Date: Wed May 2 08:46:28 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug26007 | 5 +
src/or/dirserv.c | 13 +++--
2 files changed, 16 insertions(+), 2 deletion
commit 7c3f87eb4b2c3c4ce3422b3561bee36f3c9956c1
Merge: 89a3fafd4 bb35405d2
Author: Nick Mathewson
Date: Wed Apr 25 08:01:53 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
src/or/router.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 89a3fafd49c046c3cd1c9c34f7db4798272f9ffb
Merge: 9187cdb1c 5cc3a0379
Author: Nick Mathewson
Date: Tue Apr 24 10:38:37 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
.travis.yml | 5 -
changes/travis_distcheck | 4
2 files changed, 8 insertions(+), 1 del
commit d2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9
Merge: 1438c6c71 e88863407
Author: Nick Mathewson
Date: Tue Apr 24 08:49:24 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug23693.1 | 4
src/or/config.c| 10 +-
src/or/main.c | 2 +-
src/or/router.c
commit 1438c6c7134c53b2aa3b5e9abf94fe12a4d9bd5e
Merge: f0230ee38 5c3639923
Author: Nick Mathewson
Date: Mon Apr 23 09:23:31 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug24969 | 3 +++
src/common/sandbox.c | 3 +++
2 files changed, 6 insertions(+)
_
commit f0230ee38a5031d447758259245a5121ec7e4789
Merge: c5899d5cf ce8e7427b
Author: Nick Mathewson
Date: Tue Apr 17 10:48:18 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
.travis.yml | 9 -
changes/coveralls | 3 +++
2 files changed, 11 insertions(+), 1 deletion(-)
commit c5899d5cf3a761f4049c1d6f05232731edcfeb57
Merge: d3ac47b41 5e0fbd700
Author: Nick Mathewson
Date: Mon Apr 16 13:48:23 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
src/common/address.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
___
commit d3ac47b4153fbe51ca63882ce63165abdf50901b
Merge: 124e06e85 db6902c23
Author: Nick Mathewson
Date: Tue Apr 10 14:26:32 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug24854 | 3 +++
src/or/auth_dirs.inc | 33 +
src/or/config.c
commit df519e5de87d027ba51742b2b50710c69b9db2be
Merge: 9b10eb2d7 e813116d3
Author: Nick Mathewson
Date: Thu Apr 5 08:36:13 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
.travis.yml | 4 ++--
changes/ticket25714 | 4
2 files changed, 6 insertions(+), 2 deletions(-)
commit 9b10eb2d7abe703f544aca559d385fc7f269
Merge: 0b795ce6d 834eef245
Author: Nick Mathewson
Date: Thu Apr 5 08:22:34 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/geoip-2018-04-03 | 4 +
src/config/geoip | 39253 ++
commit 5e7d505850607a16f6051a19ff60c39ff4c8393e
Merge: b5a6c0399 5acfc3087
Author: Nick Mathewson
Date: Tue Mar 27 18:24:37 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
"ours" merge to avoid earlier version of 25629 fix.
___
commit b5a6c03998d42147135385f21bd7b85a02385e0f
Merge: 66d312063 068d09274
Author: Nick Mathewson
Date: Mon Mar 26 10:29:29 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/feature25313 | 4
src/common/sandbox.c | 23 ++-
2 files changed, 6 insertio
commit bc0de600b2033c6fb109d70ff3cbd8b8dc2ad271
Merge: a0cc7e949 1aa0ae2cc
Author: Nick Mathewson
Date: Mon Mar 19 05:42:43 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
.travis.yml | 24
1 file changed, 20 insertions(+), 4 deletions(-)
___
commit d60dc27555a2bed448617e0b82e61817c9cff895
Merge: 094294dbb 0e7f15fdb
Author: Nick Mathewson
Date: Tue Mar 13 10:59:30 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/geoip-2018-03-08 | 4 +
src/config/geoip | 36382 -
commit 38b7885c90fd5e11495cb37f838fd55ca72e9290
Merge: 0026d1a67 0e7f15fdb
Author: Nick Mathewson
Date: Tue Mar 13 10:58:03 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/geoip-2018-03-08 | 4 +
src/config/geoip | 36382 -
commit d81a5231eee22d2d73a54b87b9ee13d3896220bc
Merge: 1ec386561 0aa794d30
Author: Nick Mathewson
Date: Sat Mar 3 11:33:02 2018 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
"ours" merge to avoid version bump
___
tor-commits maili
commit d01abb9346bcb7b240b5277551ea75e85dfc160c
Merge: bcfb03495 d4a758e08
Author: Nick Mathewson
Date: Thu Mar 1 16:07:59 2018 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug25249 | 3 +
changes/bug25249.2 | 3 +
changes/trove-2018-001.1 | 6 ++
changes/
commit 5b0ae084008eac13d051026c013862b239212807
Merge: d01abb934 c527a8a9c
Author: Nick Mathewson
Date: Thu Mar 1 16:43:10 2018 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
"ours" to avoid version bump.
___
tor-commits mailing li
commit bcfb034957dbd5d891befcd99a9725a225903b4e
Merge: bd71e0a0c ac1942ac5
Author: Nick Mathewson
Date: Wed Feb 21 11:53:50 2018 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
.gitmodules | 2 +-
changes/ticket25323 | 4
2 files changed, 5 insertions(+), 1 deletion(-)
_
commit bd71e0a0c8ccf684c40201f08c456596eac60887
Merge: c67adddac 2bcd264a2
Author: Nick Mathewson
Date: Fri Feb 16 09:54:13 2018 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug24952| 5 +
changes/bug25223| 4 +
changes/ticket24902 | 13 +
commit c8b087d90109d740e57d0347cb3df8d1be336337
Merge: cb9a322b6 3930ffdf6
Author: Nick Mathewson
Date: Fri Feb 16 08:47:41 2018 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug24898-029 | 6 ++
1 file changed, 6 insertions(+)
__
41 matches
Mail list logo
