commit cb8c5c023f0e349f30fd6a539437d76358b8b87a
Merge: efae1bc e5907e9
Author: Nick Mathewson
Date: Thu Jun 25 11:42:31 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-june2015 |3 +
src/config/geoip |14347 +++-
commit 5588e677bd61b56520fd73ffcfd759e39f1d226b
Merge: 6704e18 beda8d2
Author: Nick Mathewson
Date: Mon Mar 9 16:23:55 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-march2015 |3 +
src/config/geoip|12695 +++
commit 6704e18dd2e09111eeca0c76fb00a459f9da98ea
Merge: 2bcb596 addffcc
Author: Nick Mathewson
Date: Mon Mar 9 11:08:57 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/bug15083 | 10 ++
src/or/buffers.c | 11 +--
2 files changed, 19
commit dbd5a9a8f99d92b38f85728edf21b9c6bfe87f38
Merge: 137982f c3f8f5a
Author: Nick Mathewson
Date: Fri Jan 23 08:52:20 2015 -0500
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-january2015 |3 +
src/config/geoip |12872 ++
commit 8d5f1e6961feb1ef2a80d6d5a36e755a4b79007b
Merge: dca902c 8611c6b
Author: Nick Mathewson
Date: Mon Nov 24 09:18:21 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-november2014 |3 +
src/config/geoip |20036
commit 403c6ae78e2dff753d407273ce78c024a0ffb40d
Merge: 943fd4a c1dd598
Author: Nick Mathewson
Date: Sun Oct 19 15:39:48 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/bug13471 |5 +
1 file changed, 5 insertions(+)
_
commit 943fd4a252ad252d7d594622d5988634ddf8f1fc
Merge: 288b3ec c1c83eb
Author: Nick Mathewson
Date: Thu Oct 16 09:08:32 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/disable_sslv3 |4
src/common/tortls.c |4 +++-
2 files changed, 7 in
commit 244ca67e47238ae8f687c4d4038b7f696824b023
Merge: 691371b b98e3f9
Author: Nick Mathewson
Date: Wed Aug 13 12:51:27 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-august2014 |3 +
src/config/geoip | 5217
commit 015f710f72823bc31c3075fb41d3ae33eb7abe06
Merge: f5ce580 6d5efbe
Author: Nick Mathewson
Date: Mon Jul 21 14:29:30 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-july2014 |3 +
src/config/geoip | 3600
commit ab774a8500a6f4302296ff4c6ea23ba5c64eaa52
Merge: 8d9602c 555c43c
Author: Nick Mathewson
Date: Tue Jun 10 21:07:57 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
src/config/geoip |22394 +-
1 file chan
commit 1d3ffc0ec96777203b2eafee5905464d54ef9f91
Merge: 9e44df2 65575b0
Author: Nick Mathewson
Date: Tue Apr 29 13:02:18 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/md_leak_bug |5 +
src/or/routerparse.c |2 ++
2 files changed, 7 inser
commit 14bc6e8993c694702f5ab637c36b962f396660a5
Merge: efab348 6a4f5d9
Author: Nick Mathewson
Date: Thu May 1 11:44:25 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/microdesc.c
changes/bug7164_downgrade |6 ++
src/
commit efab3484e6ea3a799ccf61061450cfc35791ad41
Merge: 35699ef 8828794
Author: Nick Mathewson
Date: Wed Apr 30 20:25:15 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/bug10849_023 |6 ++
src/or/config.c |4
2 files changed, 10 i
commit 3fc0f9efb8b0030bab2574e5998a964adc93ebaa
Merge: f050cf7 ef3d7f2
Author: Nick Mathewson
Date: Wed Apr 16 14:57:14 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
src/or/routerlist.c |1 -
1 file changed, 1 deletion(-)
___
commit 149931571a4c5ad9ec24eb6d4306e8965a454211
Merge: 47f7085 75b4975
Author: Nick Mathewson
Date: Mon Apr 14 18:00:38 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/routerlist.h
changes/bug11464_023 |5 +
src/or
commit f050cf75b0d963be1aa2840bcef60c8b1e96d3b6
Merge: f3c20a2 2ce0750
Author: Nick Mathewson
Date: Wed Apr 16 13:32:20 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
src/or/routerlist.c |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
___
commit f3c20a28ab50386064043cc31edb3b1b543d6fc6
Merge: 1499315 b0e1ddb
Author: Nick Mathewson
Date: Tue Apr 15 14:51:19 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/circuituse.c
changes/bug11519|3 +++
src/or/circ
commit d7950eda2bfd927a18df4a2620952d10dda1705c
Merge: d21b24b 2658e70
Author: Nick Mathewson
Date: Tue Feb 25 10:02:14 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-february2014-regcountry |3 +
src/config/geoip | 239
commit 260b3b1a190111a7ae078c4260c470bd31292b02
Merge: e4bc757 405d055
Author: Nick Mathewson
Date: Sat Feb 15 00:06:25 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-february2014 |3 +
src/config/geoip |17809
commit 59f50c80d443a7e148f85cfed493e3e703cc4386
Merge: a82b18f 9e90707
Author: Nick Mathewson
Date: Fri Nov 15 15:29:24 2013 -0500
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/or.h
src/or/relay.c
Conflicts were simple
commit 7ef2939e5a902c6159227de176622ee9388e34a4
Merge: eb5d75e 82d8944
Author: Nick Mathewson
Date: Fri Oct 11 11:16:59 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-october2013 |3 +
src/config/geoip | 2019 ++
commit 7e0f1fa52adcf67d7b9c5459a3cc74f57bbfa3e2
Merge: 0c3c475 dece40f
Author: Nick Mathewson
Date: Tue Oct 8 12:16:42 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/bug6979 |4
src/or/router.c |2 +-
2 files changed, 5 insertions(+), 1
commit 7b1b8c36942a09ff4c50ac228f465aa4050153e3
Merge: 1137817 004a9c6
Author: Nick Mathewson
Date: Thu Oct 10 11:18:07 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
src/common/util.c|4 ++--
src/test/test_util.c |1 +
2 files changed, 3 inserti
commit 1137817319c7a9e4293e9901405d01e7b85da6ea
Merge: 73a0bb1 6eb7f2f
Author: Nick Mathewson
Date: Thu Oct 10 10:55:24 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/bug9928 |6 ++
src/common/util.c | 10 +-
2 files changed, 11 i
commit ace95c525c55387d4f219043400c9821e41994bc
Merge: 2c877d2 b46353b
Author: Nick Mathewson
Date: Mon Sep 16 12:47:05 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-september2013 |3 +
src/config/geoip|12806 ++
commit a60d21a85deacad98fa04d20fb4e83b57ad191d7
Merge: a8e76de 3cebc5e
Author: Nick Mathewson
Date: Wed Sep 4 16:08:02 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/circuitbuild.c
changes/bug9671_023 |5 +
src/or/c
commit a5610cfa64189db693dbad3efaa973d6720c42fe
Merge: 4107ddd 8611195
Author: Nick Mathewson
Date: Sun Aug 25 00:33:10 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
(Using "ours" strategy to avoid taking 9546 fix in 0.2.3; we just
merged our own
commit 3433b7ce3992b9566dba9b64f64f0676e712696a
Merge: d5cfbf9 64410cc
Author: Nick Mathewson
Date: Mon Aug 12 09:45:07 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-august2013 |3 +
src/config/geoip | 9207 +++-
commit 43f187ec2e40517148c11f8eaa915ec2ae6d1ec4
Merge: edaea77 8bf2892
Author: Nick Mathewson
Date: Thu Aug 22 20:47:10 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/bug9564|5 +
src/or/networkstatus.c |2 +-
2 files changed, 6 i
commit c78c8de015ac62eb3fa529f932bcf86dae9f3d9d
Merge: 81a5ee7 0b9c515
Author: Nick Mathewson
Date: Mon Jul 8 09:22:49 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-july2013 |3 +
src/config/geoip | 2201 +
commit 7c4544e5a4780706dee65d2a3ff8c7b55952
Merge: efa342f 60d633c
Author: Nick Mathewson
Date: Tue Jun 18 14:45:29 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
src/or/rendcommon.c |3 +++
1 file changed, 3 insertions(+)
___
commit d3063da691d0006cf41f6406099f056ab47c543a
Merge: 9e45d94 c37fdc2
Author: Nick Mathewson
Date: Tue Jun 18 10:23:03 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/config.c
src/or/relay.c
changes/bug9002 |
commit 82fea1b0dffe2cb808e997b891106651d6a7bb97
Merge: 72f775e d780cd5
Author: Nick Mathewson
Date: Fri Jun 14 01:45:35 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Using "ours" strategy to avoid taking changes.
_
commit 607b29ae1abe7da7d06e4e9282ed88a2dd7fe8d4
Merge: c860a96 4835fae
Author: Nick Mathewson
Date: Mon Jun 10 12:26:39 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/bug9017 |6 ++
src/or/connection_edge.c | 11 ++-
2 file
commit c860a96ecb652d76dc23f2b490db4f5a95e9b0c3
Merge: c03cfc0 fe689de
Author: Nick Mathewson
Date: Wed Jun 5 11:22:19 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-june2013 |3 +
src/config/geoip |106050 +---
commit 0c2fb64d6fc7a3b6a3d3d7febb72e72299bca03d
Merge: bc56918 78735f8
Author: Nick Mathewson
Date: Mon May 20 12:37:21 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-may2013 |3 +
src/config/geoip |20373 +-
commit bae5dd6c8d4535360d471932b87431f54b515567
Merge: 7d3fd85 96d3219
Author: Nick Mathewson
Date: Thu May 9 13:14:53 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/bug8844 |6 ++
src/or/buffers.c |3 ++-
src/test/test.c | 12 +++
commit 6acf0ac2851fb95953edea9c231d82f487f28c3d
Merge: 3367a76 9630fb9
Author: Nick Mathewson
Date: Mon Apr 8 11:09:50 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-apr2013 |3 +
src/config/geoip |20949 ---
commit 2ac66e59f7b32bb7f975803c9d483848e755a08f
Merge: 5959d1c ebb95d0
Author: Nick Mathewson
Date: Mon Mar 18 15:28:39 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/test/test_addr.c
changes/bug8377 |3 +++
src/commo
commit ef4db3169344567f30fb72e3e9a66154b976d889
Merge: 0196647 c6ca199
Author: Nick Mathewson
Date: Mon Mar 11 13:32:16 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
changes/geoip-mar2013 |3 +
src/config/geoip |92875 ++
40 matches
Mail list logo
