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

2013-10-11 Thread nickm
commit 82d8944928daf868d12797e59a3a58ce4cb4f205 Merge: 004a9c6 3b02651 Author: Nick Mathewson Date: Fri Oct 11 11:16:45 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-october2013 |3 + src/config/geoip | 2019 ++

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

2013-09-16 Thread nickm
commit b46353b7931235da3ecaec0723060501042d6ef4 Merge: 3cebc5e 13d192c Author: Nick Mathewson Date: Mon Sep 16 12:46:50 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-september2013 |3 + src/config/geoip|12806 ++

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

2013-08-12 Thread nickm
commit 64410cc8ff964a82613cc53475def98d9de7 Merge: 0b9c515 41bf8fa Author: Nick Mathewson Date: Mon Aug 12 09:44:36 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-august2013 |3 + src/config/geoip | 9207 +++-

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

2013-07-08 Thread nickm
commit 0b9c515870f6444fb706590103618c9a2f67c47a Merge: 60d633c 2a61b0d Author: Nick Mathewson Date: Mon Jul 8 09:22:00 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-july2013 |3 + src/config/geoip | 2201 +

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

2013-06-05 Thread nickm
commit fe689de084116bd54eb3f90baba4620eef5d1001 Merge: 78735f8 d347531 Author: Nick Mathewson Date: Wed Jun 5 11:22:02 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-june2013 |3 + src/config/geoip |106050 +---

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

2013-05-20 Thread nickm
commit 78735f87785a460e587e2fc879604a7603d4b0e5 Merge: 96d3219 f805317 Author: Nick Mathewson Date: Mon May 20 12:34:59 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-may2013 |3 + src/config/geoip |20373 +-

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

2013-04-08 Thread nickm
commit 9630fb917f3549b3fcbd4a3885e0c47f4be9be36 Merge: ebb95d0 b41f03f Author: Nick Mathewson Date: Mon Apr 8 11:09:26 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-apr2013 |3 + src/config/geoip |20949 ---

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

2013-03-11 Thread nickm
commit c6ca199888102a825f004f8613331f97525da486 Merge: 5e0ce4c 3dde6d5 Author: Nick Mathewson Date: Mon Mar 11 13:32:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-mar2013 |3 + src/config/geoip |92875 ++

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

2013-02-08 Thread nickm
commit b840b76b04fa68d2a1ef9a7532837d1b549daa25 Merge: ae15b55 adff7f9 Author: Nick Mathewson Date: Fri Feb 8 10:36:34 2013 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-feb2013 |3 + src/config/geoip | 3509 +++

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

2013-01-14 Thread nickm
commit 1625cddf3af74643bdeaa31e7684aaa15bf5ea0c Merge: 52bf155 32114d7 Author: Nick Mathewson Date: Mon Jan 14 14:24:19 2013 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-jan2013 |3 + src/config/geoip |19722 ++

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

2012-12-13 Thread nickm
commit 52bf1556b18a3af0d7d4f612cd27e956353bf5b5 Merge: 88bb48e 6bdfa29 Author: Nick Mathewson Date: Thu Dec 13 12:51:28 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-dec2012 |3 + changes/geoip-nov2012 |3 + src/config/geoip |1243

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

2012-10-23 Thread nickm
commit b0646cc1423d4ea28d68c84e38e90ba8a6cb4e29 Merge: 2ecee3f cb693ef Author: Nick Mathewson Date: Tue Oct 23 21:48:50 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/bug7191|5 + src/common/container.c | 23

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

2012-10-18 Thread nickm
commit a0e9dc9f55a452d78d9d16b4a2fc7d57dafa0409 Merge: e2549c3 8743080 Author: Nick Mathewson Date: Fri Oct 19 00:58:33 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/bug7139 |9 + src/common/tortls.c |8 2 files changed,

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

2012-09-11 Thread nickm
commit 5833861f62d2667eeda1ed0f6595763aa00250b0 Merge: 8731a4e 84f47ff Author: Nick Mathewson Date: Tue Sep 11 13:20:15 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 Conflicts: src/test/test_util.c changes/bug6811 |5 + src/com

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

2012-08-27 Thread nickm
commit 443e4ae1ee0520cead27dd3a21e9f79b1bed8f8b Merge: ce4add4 1c30e6a Author: Nick Mathewson Date: Mon Aug 27 16:07:04 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 Conflicts: src/or/policies.c changes/bug6690 |7 +++ src/or/poli

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

2012-08-03 Thread nickm
commit 93be3a8822ae791cc8adb78ea7d7e76e4c10db41 Merge: 82c5e38 d48cebc Author: Nick Mathewson Date: Fri Aug 3 12:04:11 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 Conflicts: src/or/routerlist.c changes/pathsel-BUGGY-a | 14 +

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

2012-08-03 Thread nickm
commit 1040afb2425a8056dc41b35e6d825fc329663ee6 Merge: 122c8ef 55f6357 Author: Nick Mathewson Date: Fri Aug 3 11:18:40 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/bug6530 |5 + src/or/routerparse.c |2 +- 2 files changed, 6 insert