[tor-commits] [tor/master] Merge branch 'maint-0.2.2' into maint-0.2.3

2012-07-06 Thread arma
commit 5ddb9b3134b30da0c4ae8857bc15ddaa7c29a4b1 Merge: 27ec024 4e7552e Author: Roger Dingledine a...@torproject.org Date: Fri Jul 6 16:31:40 2012 -0400 Merge branch 'maint-0.2.2' into maint-0.2.3 changes/revert-geoip-may2012 |6 + src/config/geoip |35480

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2012-06-13 Thread arma
commit 068046eebc73fbe1f0d8419f0dfea65d3de9c14a Merge: 7516b4a 229abbf Author: Roger Dingledine a...@torproject.org Date: Wed Jun 13 03:48:43 2012 -0400 Merge branch 'maint-0.2.2' changes/geoip-june2012 |3 + src/config/geoip |35480

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2012-05-10 Thread arma
commit 648db9a4b7101d54f38aee60f42546e9a172e17e Merge: 02a6507 436654e Author: Roger Dingledine a...@torproject.org Date: Thu May 10 17:57:31 2012 -0400 Merge branch 'maint-0.2.2' src/or/control.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2012-04-01 Thread arma
commit c7cbd06d5f2727c3742dfd426223f1f1ebe46f94 Merge: 341c6a5 5fed1ccd Author: Roger Dingledine a...@torproject.org Date: Sun Apr 1 16:03:16 2012 -0400 Merge branch 'maint-0.2.2' Conflicts: src/or/config.c doc/tor.1.txt |7 +-- src/or/config.c|6

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2012-02-29 Thread arma
commit 406bc9527125dccdf68745a07100bd1dc48a9903 Merge: c26aaf9 e217569 Author: Roger Dingledine a...@torproject.org Date: Wed Feb 29 13:23:23 2012 -0500 Merge branch 'maint-0.2.2' changes/maatuska-ip |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2012-02-09 Thread arma
commit 929ebde2b908616fac381be78a5828c9d0fdd273 Merge: ca431c5 85c5390 Author: Roger Dingledine a...@torproject.org Date: Thu Feb 9 04:02:18 2012 -0500 Merge branch 'maint-0.2.2' changes/manual_uri_in_torrc |3 --- src/config/torrc.sample.in |2 +- 2 files changed, 1

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2012-02-09 Thread arma
commit ef0bc7f8f26a917c89ca947a2b432b57cd5e06b5 Merge: 6c3cffe a70ff4b Author: Roger Dingledine a...@torproject.org Date: Thu Feb 9 04:21:20 2012 -0500 Merge branch 'maint-0.2.2' changes/geoip-february2012 |3 + src/config/geoip |12782

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2012-02-01 Thread arma
commit 92862c6d48026811c32d3e603524185778d0b4d7 Merge: d487d6f 688903e Author: Roger Dingledine a...@torproject.org Date: Thu Feb 2 02:32:44 2012 -0500 Merge branch 'maint-0.2.2' changes/bug5005 |3 +++ doc/tor.1.txt | 11 ++- 2 files changed, 9 insertions(+), 5

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2012-01-08 Thread arma
commit ecdea4eeafd921f0dcb053f2585d9cb05d6df658 Merge: 59d0a5a cc1580d Author: Roger Dingledine a...@torproject.org Date: Sun Jan 8 12:17:16 2012 -0500 Merge branch 'maint-0.2.2' src/common/tortls.c|5 + src/or/dirvote.c | 22 ++ src/or/dirvote.h

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2012-01-05 Thread arma
commit 9bfb8af265ce6423107e7991228b84af96b7af7b Merge: ff03347 a1074c7 Author: Roger Dingledine a...@torproject.org Date: Thu Jan 5 06:55:34 2012 -0500 Merge branch 'maint-0.2.2' changes/geoip-january2012 |3 + src/config/geoip | 9630

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-12-08 Thread arma
commit 630337e7626d19f33eba6436dbd0aae1fee94f1e Merge: 06b10cc 0582746 Author: Roger Dingledine a...@torproject.org Date: Thu Dec 8 04:40:30 2011 -0500 Merge branch 'maint-0.2.2' changes/geoip-december2011 |3 + src/config/geoip |10429

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-11-21 Thread arma
commit 6a76007b089a2ca31b67b2ce15dd28edeb416428 Merge: c9f24ed 97a209e Author: Roger Dingledine a...@torproject.org Date: Mon Nov 21 18:36:49 2011 -0500 Merge branch 'maint-0.2.2' Conflicts: src/or/dirserv.c changes/bug4518 |4 changes/feature4484 |8

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-10-27 Thread arma
commit 425e4236c6c3af653565763cfa9e921aa73cf9e0 Merge: 47dff61 9c2ca5b Author: Roger Dingledine a...@torproject.org Date: Thu Oct 27 20:04:51 2011 -0400 Merge branch 'maint-0.2.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-10-27 Thread arma
commit ba91272dedf9bacd7e7ef176c8a549f3aa5da452 Merge: 6258013 48bafb4 Author: Roger Dingledine a...@torproject.org Date: Thu Oct 27 20:53:17 2011 -0400 Merge branch 'maint-0.2.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-10-26 Thread arma
commit 03fea3ae91281c8146e5a577e18ef46e81eb6e49 Merge: a518dd6 9af3a3c Author: Roger Dingledine a...@torproject.org Date: Wed Oct 26 07:53:49 2011 -0400 Merge branch 'maint-0.2.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-10-26 Thread arma
commit 9625a2e8f5070198f58b3c343e65a3ac99765ede Merge: c21c8da 41d9d3f Author: Roger Dingledine a...@torproject.org Date: Wed Oct 26 16:36:59 2011 -0400 Merge branch 'maint-0.2.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-10-26 Thread arma
commit 2c4e89b86703f188f45f9edfc0fd3e4bbeac3511 Merge: 9625a2e f85c561 Author: Roger Dingledine a...@torproject.org Date: Wed Oct 26 17:15:09 2011 -0400 Merge branch 'maint-0.2.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-10-25 Thread arma
commit a518dd66506e44c1318c44777187dc82c275329e Merge: aa3c709 ac115f1 Author: Roger Dingledine a...@torproject.org Date: Tue Oct 25 19:34:42 2011 -0400 Merge branch 'maint-0.2.2' changes/bug4309 |5 + doc/tor.1.txt |2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-10-13 Thread arma
commit 0a083b0188cacd2f07838ff0446113bd5211a024 Merge: 5b8bfb3 56180d1 Author: Roger Dingledine a...@torproject.org Date: Thu Oct 13 10:14:38 2011 -0400 Merge branch 'maint-0.2.2' changes/geoip-october2011 |3 + src/config/geoip | 5460

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-09-28 Thread arma
commit 4e88a3bc3e1a195864c3185d16d89e090246fc55 Merge: 458cc9d 0b5d264 Author: Roger Dingledine a...@torproject.org Date: Wed Sep 28 15:13:05 2011 -0400 Merge branch 'maint-0.2.2' changes/bug4115|7 +++ src/or/directory.c |3 +-- 2 files changed, 8 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-09-28 Thread arma
commit 36829539d64dab47e07bd619b7b833ef50d26853 Merge: 4e88a3b ff8aba7 Author: Roger Dingledine a...@torproject.org Date: Wed Sep 28 15:38:02 2011 -0400 Merge branch 'maint-0.2.2' changes/bug4124 |6 ++ src/or/circuitbuild.c |5 +++-- 2 files changed, 9 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-09-24 Thread arma
commit 88516f65c9753d6ec60dd7cb0c28c3ff91fdb101 Merge: 5a8dcca 1c2e4d1 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 24 22:47:53 2011 -0400 Merge branch 'maint-0.2.2' changes/ticket-4063 |6 ++ src/or/circuitbuild.c |6 +++--- 2 files changed, 9 insertions(+), 3

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-09-15 Thread arma
commit 0c0345a3d003a0a52b9334ad559698a220e8b76d Merge: 2394c74 ac7b6c5 Author: Roger Dingledine a...@torproject.org Date: Thu Sep 15 16:35:26 2011 -0400 Merge branch 'maint-0.2.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-09-13 Thread arma
commit 1fcaeb60924d155e80a9579588a1b6c31e2174f7 Merge: 1e1cc43 4a351b4 Author: Roger Dingledine a...@torproject.org Date: Tue Sep 13 18:32:00 2011 -0400 Merge branch 'maint-0.2.2' changes/bug4014 |3 +++ src/or/main.c |7 --- src/or/or.h |4 +++- src/or/router.c |

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-09-12 Thread arma
commit 1e1cc43b5723008dc6ec19188b1613c3682c36d3 Merge: 3869661 d679ef6 Author: Roger Dingledine a...@torproject.org Date: Mon Sep 12 05:54:55 2011 -0400 Merge branch 'maint-0.2.2' changes/geoip-september2011 |3 + src/config/geoip| 5974

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-09-02 Thread arma
commit fe0fa91164bf1f8f305fc048b472fb6445551533 Merge: f68cd4a e0dae64 Author: Roger Dingledine a...@torproject.org Date: Fri Sep 2 07:23:37 2011 -0400 Merge branch 'maint-0.2.2' changes/bug3898a |6 ++ doc/tor.1.txt| 17 + 2 files changed, 15 insertions(+),

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-07-05 Thread arma
commit ab8c0d4c9e23b1c4e2d9e56d87b1b61505a2a8db Merge: 7295ad1 4f74979 Author: Roger Dingledine a...@torproject.org Date: Wed Jul 6 00:49:11 2011 -0400 Merge branch 'maint-0.2.2' src/or/circuitbuild.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-05-29 Thread arma
commit 6917728637bdbaed86d48d394eab6a063c319269 Merge: e676db6 5f182ea Author: Roger Dingledine a...@torproject.org Date: Sun May 29 19:11:07 2011 -0400 Merge branch 'maint-0.2.2' src/or/circuitbuild.c |2 +- src/or/main.c |5 - 2 files changed, 5 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-05-20 Thread arma
commit 0a4649e6576cacc07c215c481fd1c500cd563a3b Merge: eecf883 b8ffb00 Author: Roger Dingledine a...@torproject.org Date: Fri May 20 03:03:46 2011 -0400 Merge branch 'maint-0.2.2' changes/bug3252 |4 src/or/config.c |2 +- src/or/connection.c |2 +- src/or/dns.c

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-05-17 Thread arma
commit 92081f3cdc2e91f7eb9954af2b647ab0bc65d047 Merge: c240efa 07c5026 Author: Roger Dingledine a...@torproject.org Date: Tue May 17 20:50:18 2011 -0400 Merge branch 'maint-0.2.2' changes/bug3198 |4 src/or/main.c |5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-05-17 Thread arma
commit 18f1b354ece34947e9a17b5cefb33cfbd73641e7 Merge: 92081f3 073fed0 Author: Roger Dingledine a...@torproject.org Date: Tue May 17 21:15:24 2011 -0400 Merge branch 'maint-0.2.2' changes/bug3200 |6 ++ src/or/config.c |8 ++-- 2 files changed, 12 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-05-10 Thread arma
commit 6d5478a8a7734553fc84574e725625610f46dc8c Merge: e6980fa 7206d78 Author: Roger Dingledine a...@torproject.org Date: Tue May 10 23:06:12 2011 -0400 Merge branch 'maint-0.2.2' changes/geoip-may2011 |3 + doc/HACKING |2 + src/config/geoip | 6479

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-04-04 Thread arma
commit 1587e0d47061fbdb5e53730172231765fdd351c9 Merge: ee871e7 9d2b384 Author: Roger Dingledine a...@torproject.org Date: Mon Apr 4 03:54:03 2011 -0400 Merge branch 'maint-0.2.2' changes/geoip-apr2011 |3 + src/config/geoip | 6197 ++---

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-03-11 Thread arma
commit 0b07b5dc989b50cb9fad82efe946f160713420cf Merge: 4740311 879f171 Author: Roger Dingledine a...@torproject.org Date: Fri Mar 11 17:40:16 2011 -0500 Merge branch 'maint-0.2.2' ReleaseNotes | 51 +++ 1 files changed, 51 insertions(+), 0

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-03-08 Thread arma
commit cb3c3c63cb5d0ee1a927dd9cc2fc67d3cc7bc88f Merge: f9bb3ce dbd4a01 Author: Roger Dingledine a...@torproject.org Date: Tue Mar 8 16:14:53 2011 -0500 Merge branch 'maint-0.2.2' doc/HACKING | 41 + 1 files changed, 41 insertions(+), 0

[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

2011-02-22 Thread arma
commit 108f48dfc7f1b6bdace9b859e01dbab79aeff071 Merge: 2eadbd4 4f730e4 Author: Roger Dingledine a...@torproject.org Date: Tue Feb 22 14:44:32 2011 -0500 Merge branch 'maint-0.2.2' doc/spec/README |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)