commit e5deb2bbc73d8830ae6c479a4532e72112f5484a
Merge: 6945f2b3e a521c4278
Author: Nick Mathewson
Date: Fri May 17 08:10:16 2019 -0400
Merge branch 'maint-0.3.4' into maint-0.3.5
changes/geoip-2019-05-13 | 4 +
src/config/geoip | 15407
commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748
Merge: 316aed502 48e990359
Author: teor
Date: Sat Apr 6 09:33:20 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 4aa02d3c7abe84e99874f6bf7bfffb7b551935a5
Merge: 0418d4081 3cfcfbac4
Author: Nick Mathewson
Date: Wed Apr 3 09:27:43 2019 -0400
Merge branch 'maint-0.3.4' into maint-0.3.5
changes/geoip-2019-04-02 | 4 +
src/config/geoip | 10355
commit 0418d4081acd2708a16dd757af4aac4777658da9
Merge: 3280e9a11 74775b2df
Author: teor
Date: Tue Apr 2 11:45:22 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
changes/bug29703 | 4
1 file changed, 4 insertions(+)
___
commit 3280e9a116df6202dba4e3ee50a9c9d2a1f6699d
Merge: 091f8688b 6d057c56f
Author: teor
Date: Wed Mar 27 10:02:40 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 41cd05562f68c23f8c3d95472e20a86165f6dc20
Merge: 6bf9078ce d7a5fdcb7
Author: teor
Date: Wed Mar 20 09:48:03 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
changes/bug29706_minimal | 4
src/feature/dirauth/shared_random_state.c | 4 ++--
commit 5d41e2223f64517300aad168b2f2479ba00ac10b
Merge: ffd720702 e021f89f3
Author: teor
Date: Thu Mar 14 06:59:09 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the
commit d6f77b99dac1a368514cfcfc1d6c5908ef6dd74a
Merge: 1c248fa27 155b0f552
Author: Nick Mathewson
Date: Wed Mar 6 14:29:38 2019 -0500
Merge branch 'maint-0.3.4' into maint-0.3.5
changes/geoip-2019-03-04 | 4 +
src/config/geoip | 12163
commit 1c248fa27d978a3a20f29ea76cc23c4c4604d1a0
Merge: de0969ef7 f56645917
Author: teor
Date: Fri Mar 1 14:16:59 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit de0969ef7816d54acdcc9f1e2960d8bbc4400ecf
Merge: be29dfedd 6a61a020e
Author: teor
Date: Thu Feb 28 10:49:33 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
src/test/test_shared_random.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit be29dfedd99f49b8bf22422eff04986f12580733
Merge: 15dc33849 524731503
Author: teor
Date: Thu Feb 28 10:45:59 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
changes/bug29599 | 3 +++
src/test/test_shared_random.c | 5 +++--
2 files changed, 6 insertions(+), 2
commit 15dc33849eda4fba651bf4096a9e405d737a977b
Merge: 1216f9953 1a194beb2
Author: teor
Date: Wed Feb 27 09:38:04 2019 +1000
Merge branch 'maint-0.3.4' into maint-0.3.5
changes/bug29145| 3 +++
src/test/test-memwipe.c | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
commit e1079266e73c70cc0e5141249ebf3199a849017d
Merge: 4a8a1f76e a56b9501f
Author: Nick Mathewson
Date: Thu Feb 21 13:23:52 2019 -0500
Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" to avoid version bump.
___
tor-commits mailing
commit 4a8a1f76ea6cbde128f2cda49049866ea739931d
Merge: c663716b6 506264791
Author: Nick Mathewson
Date: Thu Feb 21 10:08:14 2019 -0500
Merge branch 'maint-0.3.4' into maint-0.3.5
changes/ticket29168 | 5 +
src/core/or/scheduler_kist.c | 2 +-
2 files changed, 6
commit 46910c060f6d0065f1745500e2bef89da8f8801a
Merge: d83c299eb 508002a4c
Author: Nick Mathewson
Date: Thu Feb 21 09:50:46 2019 -0500
Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" to avoid version bump.
___
tor-commits mailing
15 matches
Mail list logo
