commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12
Merge: f56645917 0c9cd7c48
Author: Nick Mathewson
Date: Wed Mar 6 14:29:33 2019 -0500
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/geoip-2019-03-04 | 4 +
src/config/geoip | 12163
commit f56645917e6c4743b285eb82e797accb3723399a
Merge: 6a61a020e 76b55fde8
Author: teor
Date: Fri Mar 1 14:16:22 2019 +1000
Merge branch 'maint-0.3.3' into maint-0.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 6a61a020eefa74b8466fa043f95391d37c06fcf6
Merge: 524731503 be71cce9f
Author: teor
Date: Thu Feb 28 10:49:19 2019 +1000
Merge branch 'maint-0.3.3' into maint-0.3.4
src/test/test_shared_random.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 524731503e0a885ab2dbb778831aa79875f8edae
Merge: 1a194beb2 3313444ef
Author: teor
Date: Thu Feb 28 10:45:44 2019 +1000
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug29599 | 3 +++
src/test/test_shared_random.c | 5 +++--
2 files changed, 6 insertions(+), 2
commit 1a194beb2c01999e08010b44c279cbaaeeadf86c
Merge: a56b9501f 6c966b894
Author: teor
Date: Wed Feb 27 09:37:50 2019 +1000
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug29145| 3 +++
src/test/test-memwipe.c | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
commit df70c44960aec3abc617b4d395bf5443c543cedc
Merge: 506264791 fb309f6eb
Author: Nick Mathewson
Date: Thu Feb 21 13:23:22 2019 -0500
Merge branch 'maint-0.3.3' into maint-0.3.4
"ours" to avoid version bump
___
tor-commits mailing
commit 50626479183858d25d4e52b80b000dbb43097917
Merge: 508002a4c be84ed1a6
Author: Nick Mathewson
Date: Thu Feb 21 10:08:14 2019 -0500
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/ticket29168 | 5 +
src/or/scheduler_kist.c | 2 +-
2 files changed, 6 insertions(+), 1
commit 7614a8b612619affe2b216aab34556aea1b26fb4
Merge: db209d4db 41c2bf590
Author: Nick Mathewson
Date: Thu Feb 21 09:49:56 2019 -0500
Merge branch 'maint-0.3.3' into maint-0.3.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
