commit 6862eada65a6f41304b32c3d4fca3da9c240d5bd
Merge: f794b40ec 0bfd1c318
Author: Nick Mathewson
Date: Tue Aug 1 11:19:29 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-july2017 | 4 +
src/config/geoip | 10075 --
commit f794b40ec0056ae8642d995b3cbce04441ebe26e
Merge: 0ad5a6b03 af39c13a0
Author: Nick Mathewson
Date: Wed Jul 26 15:39:55 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
___
commit 0ad5a6b034df39df8cc390ee32042d4cb0683b93
Merge: 715185477 09618bc48
Author: Nick Mathewson
Date: Wed Jul 26 15:34:56 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
.travis.yml | 88
changes/bug22636 | 8 ++
commit 715185477d135d87f8ebf6fb12804cb2db5856bb
Merge: f6420bc 78dfa76
Author: Nick Mathewson
Date: Fri Jul 7 10:51:28 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug22789 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
_
commit f6420bceec9707324fe23c98a2a70dd2612f183f
Merge: 3de2761 ff8c230
Author: Nick Mathewson
Date: Wed Jul 5 13:42:32 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug22789 | 6 ++
src/common/compat.c | 8 ++--
src/test/test_addr.c | 9 +
3 files cha
commit 3de27618e65affe3688a5d92bce96e1e4ed5a82a
Merge: 3913f95 ccae991
Author: Nick Mathewson
Date: Tue Jun 27 11:04:44 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug22737 | 12
src/or/connection_or.c | 4 +++-
2 files changed, 15 insertions(+), 1 d
commit 3913f959e3688cfa91f9fab5368ba149e00cfec6
Merge: eb92d11 325c507
Author: Nick Mathewson
Date: Fri Jun 9 09:58:45 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-june2017 |4 +
src/config/geoip | 5079 +---
sr
commit eb92d11f53dd2245f4cfd618bde3996e76b498cf
Merge: 95a88f7 1a7af74
Author: Nick Mathewson
Date: Thu Jun 8 14:05:59 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
"ours" merge to avoid version bump.
___
tor-commits mailing lis
commit b796ad0300d1b023bc38e5a1498b47bc2e680eae
Merge: 0de4620 77c5d8c
Author: Nick Mathewson
Date: Thu Jun 8 09:28:29 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
"ours" merge to avoid version bump.
___
tor-commits mailing lis
commit 40bccc20042fcc4f43964b358257470830169e73
Merge: a56cfda dec7998
Author: Nick Mathewson
Date: Thu Jun 8 09:21:15 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/trove-2017-005 | 7 +++
src/or/relay.c | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
commit a56cfdaba20683562e5793d6bded58a591afb04c
Merge: 9ea3d08 2e5220c
Author: Nick Mathewson
Date: Mon Jun 5 14:39:06 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
Ours merge to avoid taking 4ee48cb434c46d9e4c477dabd8a97f03e3db221d
___
commit 9ea3d0877a5be2762cfcb4d7c2015e5ec43a2055
Merge: 159ddf6 1a540b5
Author: Nick Mathewson
Date: Mon Jun 5 12:00:27 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug22490 | 3 +++
src/or/geoip.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
___
commit 159ddf6ddedcad2bfc277a36fbde4aeb573be4cf
Merge: 21d7767 68d6720
Author: Nick Mathewson
Date: Mon May 8 08:07:04 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-may2017 |4 +
src/config/geoip | 5862 +++--
src
commit 21d776738c2abf6ee0527439f7b96d35942c129c
Merge: ecc73c3 a8a860e
Author: Nick Mathewson
Date: Thu Apr 6 08:31:18 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-april2017 | 4 +
src/config/geoip| 14366 +-
commit ecc73c3c035abe1a2c33e924e37e55064e712d56
Merge: 57e778f 933a1e7
Author: Nick Mathewson
Date: Wed Mar 8 10:10:44 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-march2017 | 4 +
src/config/geoip| 13115 +++---
commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac
Merge: f7ed4a7 884b371
Author: Nick Mathewson
Date: Tue Feb 28 10:25:51 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
"ours" merge to avoid version bumps
___
tor-commits mailing
commit 3781f24b8014213c200f74973deb550382957a01
Merge: 43c18b1 a452b71
Author: Nick Mathewson
Date: Wed Feb 15 07:47:12 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug20384 | 10 ++
changes/trove-2017-001.2 | 8
src/or/routerparse.c | 49 ++
commit f7ed4a7d8f489aeb31246e4b75c30b40bbf94fa6
Merge: 6e7ff9e aeb299b
Author: Nick Mathewson
Date: Wed Feb 15 07:52:33 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://l
commit e778a411b9e75ad2c1b46a6624d586a6f4a0c554
Merge: 43c18b1 144ec3d
Author: Roger Dingledine
Date: Mon Feb 13 15:27:57 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug20384 | 10 ++
1 file changed, 10 insertions(+)
commit 43c18b1b7a1a10d36e16393b9f35b519f1c40fa9
Merge: f2a3041 124062e
Author: Nick Mathewson
Date: Mon Feb 13 14:37:42 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-february2017 | 4 +
src/config/geoip | 10832 -
commit f2a30413a35bb360323a98fb124fbc629245978d
Merge: 5446cb8 2ce4330
Author: Nick Mathewson
Date: Tue Feb 7 10:37:53 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug16248 | 8
changes/bug18710 | 6 ++
src/or/dnsserv.c | 4 +---
src/or/main.c| 55 +++
commit c6f2ae514eb2713d386bedac2f7e71ed04385026
Merge: e6965f7 b9ef21c
Author: Nick Mathewson
Date: Tue Feb 7 09:18:54 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bifroest | 3 +++
src/or/config.c | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --cc sr
commit e6965f78b80e2b83367df05e204c97f5c0929a3c
Merge: 8936c50 6b37512
Author: Nick Mathewson
Date: Tue Feb 7 08:54:54 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/rsa_init_bug | 7 +++
src/common/crypto.c | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
commit 8936c50d83f3a90fb6bb3314b86f56f46d42d749
Merge: da0d5ad 05ec055
Author: Nick Mathewson
Date: Tue Feb 7 08:39:07 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug17404| 6 ++
src/common/tortls.c | 4
2 files changed, 10 insertions(+)
__
commit da0d5ad9830b22983864660ca1c732627e119747
Merge: 54771bc 332543b
Author: Nick Mathewson
Date: Tue Feb 7 08:34:37 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
https:/
commit 54771bcaba592530d5759832beb868afba1b9595
Merge: b6227ed 34fdd51
Author: Nick Mathewson
Date: Wed Jan 11 09:12:21 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-january2017 |4 +
src/config/geoip | 3160 +
commit 746c51b6132d84fc7899e6b95b4a1666717d8cce
Merge: b18bde2 39ef343
Author: Nick Mathewson
Date: Tue Dec 20 18:22:27 2016 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
("ours" merge because there is a separate 20384 patch for 026)
commit b18bde23cf9c0afc95a83c3bfc7205218add4ddd
Merge: 3d9f8ff db58d4d
Author: Nick Mathewson
Date: Tue Dec 20 18:11:25 2016 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug21018 | 11 +++
src/or/rendcommon.c | 6 --
src/or/routerparse.c | 6 +++---
3 files
commit 3d9f8ff6a5c37e9f124f8111f904b97f095ca621
Merge: 6c2174d 3d2d3f2
Author: Nick Mathewson
Date: Fri Dec 9 08:34:06 2016 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-december2016 |4 +
src/config/geoip | 6259 ++--
commit 6c2174d44d01b4c231befe9de5ce2ffb042cc65d
Merge: 12a7298 db2571b
Author: Nick Mathewson
Date: Mon Nov 7 09:30:16 2016 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-november2016 |4 +
src/config/geoip | 4025
commit 12a72983766d5265b5259038af711cb172671af7
Merge: 52a99cb 304d8f3
Author: Nick Mathewson
Date: Thu Oct 6 09:59:03 2016 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-october2016 | 4 +
src/config/geoip | 63919 +---
commit 52a99cb6c1e7cbcc33ed9dfd09fdcb7680f7d29b
Merge: 742ff2c e4d82da
Author: Nick Mathewson
Date: Wed Sep 7 13:53:53 2016 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-september2016 | 4 +
src/config/geoip| 30846 +---
commit 742ff2cddbb9676262e1b588206c3ae264f269b8
Merge: 210928f 46754d6
Author: Nick Mathewson
Date: Fri Aug 12 10:27:01 2016 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-august2016 | 4 +
src/config/geoip | 14009 +
commit 210928f66a5acda19d3a0a00d44f1f9523fecfe3
Merge: 92891de d95c280
Author: Nick Mathewson
Date: Tue Jul 19 12:31:54 2016 +0200
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-july2016 |4 +
src/config/geoip | 4615 +---
s
commit 92891ded3016dd7cabb34b401ff964e325bd7d1d
Merge: c28ba99 19078b1
Author: Nick Mathewson
Date: Tue Jul 5 13:51:51 2016 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/19271 | 2 ++
1 file changed, 2 insertions(+)
___
tor-commits
commit c28ba994ec95f4f669ad5131f36b0f9f1cc53782
Merge: b4bb886 9d3de77
Author: Nick Mathewson
Date: Tue Jul 5 12:21:25 2016 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
src/or/config.c | 3 ---
1 file changed, 3 deletions(-)
___
tor-commit
commit b4bb88606e52c21c3b831a957516057004152bf4
Merge: 0b477bf f25f7b7
Author: Nick Mathewson
Date: Mon Jun 13 10:48:48 2016 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-jun2016 |4 +
src/config/geoip | 3349 +++--
sr
commit 0b477bfd55b16d04ddd97cec09ec978e2a57ba3b
Merge: 2ce99b9 3681463
Author: Nick Mathewson
Date: Mon May 9 14:55:45 2016 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-may2016 |4 +
src/config/geoip | 6991 -
src
commit 2ce99b9f48477a9a93fd6987d8a4e19a20b9733a
Merge: 443dddb 34a51d1
Author: Nick Mathewson
Date: Thu Apr 7 10:45:38 2016 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-april2016 |4 +
src/config/geoip| 3255 +++
s
commit 443dddb74966eea0b30231b9f18b80b9372f2210
Merge: 740421a 21f9829
Author: Nick Mathewson
Date: Wed Mar 9 10:36:35 2016 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-march2016 |4 +
src/config/geoip| 8496 +++
s
commit 740421af194b890c24242a834ed03ffc5c4c16ab
Merge: 44ad3be ce289e2
Author: Nick Mathewson
Date: Thu Feb 11 12:57:28 2016 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug18162 | 7 +++
src/common/container.c | 37 -
2 files ch
commit 44ad3be221fb8e5e648c6d56054fb1d8596a645b
Merge: e2efa9e f06d9a9
Author: Nick Mathewson
Date: Fri Feb 5 08:13:24 2016 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-february2016 |4 +
src/config/geoip | 2144 +---
commit 1adc2bf66fedb1768c5013dcf5f4778fae453217
Merge: b53ff86 c3d11b1
Author: Nick Mathewson
Date: Tue Dec 8 10:20:21 2015 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug17772|7 +++
src/or/routerlist.c | 10 --
2 files changed, 15 insertions(+), 2 del
commit b53ff8606714c2f94d251a40c1a073bca760495e
Merge: 089ee13 4328525
Author: Nick Mathewson
Date: Tue Dec 8 09:43:25 2015 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/bug17781 |3 +++
1 file changed, 3 insertions(+)
___
tor-c
commit 089ee13534b8e1acf053154562debbcdcfc92d07
Merge: 2ec5e24 e8e89fd
Author: Nick Mathewson
Date: Mon Dec 7 10:10:44 2015 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-december2015 |4 +
src/config/geoip | 4547
45 matches
Mail list logo
