[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-02-25 Thread arma
commit 4f730e4f3f39748e214470357e3d7aff407fe7e0 Merge: cdc59c1 0ab62a4 Author: Roger Dingledine Date: Tue Feb 22 14:44:09 2011 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 doc/spec/README |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) __

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-03-08 Thread arma
commit 6426cd14f37c2b24232f02d5c978313fab6a667f Merge: 0044697 d080fe8 Author: Roger Dingledine Date: Tue Mar 8 18:16:06 2011 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-mar2011 |3 + src/config/geoip | 7639 - 2

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-03-11 Thread arma
commit 879f1718ad59682387ffc54b9d8589badb5f1e81 Merge: 48c4d53 151ab61 Author: Roger Dingledine Date: Fri Mar 11 17:39:54 2011 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 ReleaseNotes | 51 +++ 1 files changed, 51 insertions(+), 0 de

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-04-04 Thread arma
commit 9d2b3849b2052bc6b54028c658a8b27fae452ea4 Merge: 65eb0e4 0cdd262 Author: Roger Dingledine Date: Mon Apr 4 03:53:38 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-apr2011 |3 + src/config/geoip | 6197 ++--- 2

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-05-10 Thread arma
commit 7206d784dc3def970d5bd8618242f7b9c9c71e37 Merge: ec25c1f e7b10e5 Author: Roger Dingledine Date: Tue May 10 23:05:51 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-may2011 |3 + src/config/geoip | 6479 +

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-06-19 Thread arma
commit 83e3975c8bebb3f0aeb95d672e09d31797f7bd6a Merge: 7aa20b2 bf4b819 Author: Roger Dingledine Date: Sun Jun 5 11:13:50 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-june2011 |3 + src/config/geoip | 5398 +---

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-07-07 Thread arma
commit 8e3830352f806b680d1c60b66c8cc7fb67f76175 Merge: 3ab0976 51d6e95 Author: Roger Dingledine Date: Thu Jul 7 13:29:02 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-july2011 |3 + src/config/geoip | 6345 ++--

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-09-13 Thread arma
commit 4a351b4b9ebfadf27d68e6bb3e1470cdef83ef45 Merge: d679ef6 62ec584 Author: Roger Dingledine Date: Tue Sep 13 18:27:13 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 Conflicts: src/or/main.c src/or/router.c changes/bug4014 |3 +++ src/or/main.c |

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-10-23 Thread arma
commit ac7b6c508dca24a256abc30b4ecaf21019569a38 Merge: 4a351b4 679f617 Author: Roger Dingledine Date: Thu Sep 15 16:34:47 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 ___ tor-commits mailing list tor-commits@lists.torproject.org http

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-10-23 Thread arma
commit 56180d169acb12302c65c1b5843f829cdb3aede2 Merge: 9648f03 ee545cd Author: Roger Dingledine Date: Thu Oct 13 10:14:16 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-october2011 |3 + src/config/geoip | 5460 +++

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-10-26 Thread arma
commit 9af3a3c419fdad85933cad800a995f19bda08d28 Merge: ac115f1 c5a3664 Author: Roger Dingledine Date: Wed Oct 26 07:47:42 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 ___ tor-commits mailing list tor-commits@lists.torproject.org http

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-10-26 Thread arma
commit 41d9d3f90437ae9dbde1590faf0ffc412c68df19 Merge: 4a1a89b cecc5b7 Author: Roger Dingledine Date: Wed Oct 26 16:34:45 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 ___ tor-commits mailing list tor-commits@lists.torproject.org http

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-10-26 Thread arma
commit f85c56182f485bea483288a26fd74cefcb87653a Merge: 41d9d3f a166f10 Author: Roger Dingledine Date: Wed Oct 26 17:14:39 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 ___ tor-commits mailing list tor-commits@lists.torproject.org http

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-10-27 Thread arma
commit 9c2ca5b52f0d8eb504cff0e80ac6366e87224ead Merge: 4684ced 5d30951 Author: Roger Dingledine Date: Thu Oct 27 20:03:21 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2 ___ tor-commits mailing list tor-commits@lists.torproject.org http

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2012-02-29 Thread arma
commit a70ff4b2cba8a46a402b5add5cee31ce5f8a0836 Merge: 85c5390 4180624 Author: Roger Dingledine Date: Thu Feb 9 04:21:08 2012 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-february2012 |3 + src/config/geoip |12782 +-

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2011-12-08 Thread arma
commit 0582746e0d25ef07e925521f9e6eb272725f64ee Merge: 6171bdd ff2c9ac Author: Roger Dingledine Date: Thu Dec 8 04:40:15 2011 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-december2011 |3 + src/config/geoip |10429 --

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

2012-01-05 Thread arma
commit a1074c7aa2afab595d434c52754ee47cec404189 Merge: d861b4c df17b62 Author: Roger Dingledine Date: Thu Jan 5 06:45:28 2012 -0500 Merge branch 'maint-0.2.1' into maint-0.2.2 changes/geoip-january2012 |3 + src/config/geoip | 9630