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

2014-09-20 Thread arma
commit 288b3ec6035aad694942960f3b71693907f7e584 Merge: 0c3b365 0eec8e2 Author: Roger Dingledine Date: Sat Sep 20 16:49:24 2014 -0400 Merge branch 'maint-0.2.3' into maint-0.2.4 changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ___

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

2012-11-12 Thread arma
commit a90affa84b3597667fd5dc8d9ff761a462653750 Merge: f473d83 88bb48e Author: Roger Dingledine Date: Mon Nov 12 23:49:37 2012 -0500 Merge branch 'maint-0.2.3' changes/bug7464 |4 src/or/main.c |2 +- 2 files changed, 5 insertions(+), 1 deletions(-) ___

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

2012-10-23 Thread arma
commit 4c06a804d946de238e2d6a0b1a7dd655b0d82ccc Merge: 0712d60 2ecee3f Author: Roger Dingledine Date: Tue Oct 23 17:26:07 2012 -0400 Merge branch 'maint-0.2.3' changes/bug7190 |6 ++ src/or/policies.c |5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) __

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

2012-09-22 Thread arma
commit dc014c97472e3adf2306938841c13de0040a2ff0 Merge: a2f57b9 c88a4c5 Author: Roger Dingledine Date: Sat Sep 22 09:31:09 2012 -0400 Merge branch 'maint-0.2.3' changes/ticket5749 |3 +++ src/or/config.c|3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) _

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

2012-09-13 Thread arma
commit 9ab3b332aec076451dd93d11ce7ce1fd81ff7294 Merge: abbde7b 909691f Author: Roger Dingledine Date: Fri Sep 14 02:41:13 2012 -0400 Merge branch 'maint-0.2.3' doc/tor.1.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ___ tor-co

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

2012-09-10 Thread arma
commit d85b563dbb0c57bc5731e664952ed3f8b9a8f6e8 Merge: 19b2126 8731a4e Author: Roger Dingledine Date: Mon Sep 10 18:25:57 2012 -0400 Merge branch 'maint-0.2.3' changes/bug6801 |5 + src/or/rephist.c |3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)

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

2012-09-05 Thread arma
commit 6f82ae44cb85e61a729ccb7ce47451dae97e8602 Merge: f8c1ab7 97dbff5 Author: Roger Dingledine Date: Wed Sep 5 16:41:43 2012 -0400 Merge branch 'maint-0.2.3' doc/tor.1.txt |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ___ tor-c

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

2012-07-31 Thread arma
commit 1049d315d7055cb98095001cb5fefae0f40d36de Merge: 08e65ce 1004489 Author: Roger Dingledine Date: Tue Jul 31 05:10:23 2012 -0400 Merge branch 'maint-0.2.3' src/or/dns.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ___ tor-com

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

2012-07-06 Thread arma
commit 6cad84503bcd58f2cbe6767a3363d398d46bf224 Merge: 1fee920 5ddb9b3 Author: Roger Dingledine Date: Fri Jul 6 16:32:08 2012 -0400 Merge branch 'maint-0.2.3' changes/revert-geoip-may2012 |6 + src/config/geoip |35480 ++ 2 files cha

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

2012-07-06 Thread arma
commit 1fee920999bb51e2831b03faff7dabbcf20355e7 Merge: 7e1a0bb 27ec024 Author: Roger Dingledine Date: Fri Jul 6 08:59:26 2012 -0400 Merge branch 'maint-0.2.3' changes/bug6271 |7 +++ src/or/relay.c |7 ++- 2 files changed, 13 insertions(+), 1 deletions(-) ___

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

2012-07-01 Thread arma
commit 46434ecf5b6f1ad88deb86fdac044c41ae4b534b Merge: 6061cd5 d13389b Author: Roger Dingledine Date: Sun Jul 1 17:37:59 2012 -0400 Merge branch 'maint-0.2.3' changes/bug6252 |8 src/or/relay.c | 14 -- 2 files changed, 0 insertions(+), 22 deletions(-) ___

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

2012-07-01 Thread arma
commit 6061cd584c129eb8b5ed24fb5ce686a0236913e4 Merge: ed2601f c32ec9c Author: Roger Dingledine Date: Sun Jul 1 05:32:37 2012 -0400 Merge branch 'maint-0.2.3' changes/bug6252 |8 src/or/relay.c | 14 ++ 2 files changed, 22 insertions(+), 0 deletions(-) ___

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

2012-06-23 Thread arma
commit 95ad59fa79cba73a6916b5deccee12b541d5f756 Merge: db9ce36 ce44346 Author: Roger Dingledine Date: Sat Jun 23 15:46:29 2012 -0400 Merge branch 'maint-0.2.3' ChangeLog |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ___ tor-commit