[tor-commits] [tor-launcher/master] Bump version to 0.2-alpha for release.

commit 394c303a43dcd0bc26ff6aac48f9eeda4d6d6a10 Author: Mike Perry Date: Wed Jun 5 12:15:02 2013 -0700 Bump version to 0.2-alpha for release. --- src/install.rdf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 15dadeb..497fa45

[tor-commits] [tor-launcher/master] Update transifex translations.

commit b6172ef809b2839bd8fed07d70fe35d66f0abf7c Author: Mike Perry Date: Wed Jun 5 12:03:51 2013 -0700 Update transifex translations. --- src/chrome/locale/fr/network-settings.dtd | 42 ++--- src/chrome/locale/fr/progress.dtd |2 +- 2 files changed, 22

[tor-commits] [tor-launcher/master] Fix a typo in translation update script.

commit 1e0c33a6c08f26651dde5bea065d439c105701ca Author: Mike Perry Date: Wed Jun 5 12:00:31 2013 -0700 Fix a typo in translation update script. --- localization/import-translations.sh |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/localization/import-translation

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

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 +---

[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013'

commit bcdc0022693c75ea1523468e783bf03832e0a358 Merge: 7159e19 9b233ac Author: Nick Mathewson Date: Wed Jun 5 11:22:48 2013 -0400 Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013' src/config/geoip-manual | 53 --- 1 file chang

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

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/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

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

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.4'

commit 7159e19ea90b16d35beefd09ff84bf69b71d23ee Merge: beec881 c860a96 Author: Nick Mathewson Date: Wed Jun 5 11:22:36 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/geoip-june2013 |3 + src/config/geoip |106050 +

[tor-commits] [tor/master] Remove 9 now unused manual A1 substitutions.

commit 9b233acd03706e9c0274db47be33cd27603847cf Author: Karsten Loesing Date: Wed Jun 5 08:40:39 2013 +0200 Remove 9 now unused manual A1 substitutions. --- src/config/geoip-manual | 53 --- 1 file changed, 53 deletions(-) diff --git a/src/con

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

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 +---

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

commit beec881f92d25b4e85aa30be341d30fce54b2e50 Merge: 4d7ac69 c03cfc0 Author: Nick Mathewson Date: Wed Jun 5 11:20:45 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' doc/tor.1.txt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) _

[tor-commits] [tor/master] Fix two cut'n'paste docu bugs.

commit c03cfc05468077d5db52ec660a2e7e3fb086a751 Author: Linus Nordberg Date: Wed Jun 5 15:48:57 2013 +0200 Fix two cut'n'paste docu bugs. --- doc/tor.1.txt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index adcf6b7..56d163b 100644

[tor-commits] [tor/maint-0.2.4] Fix two cut'n'paste docu bugs.

commit c03cfc05468077d5db52ec660a2e7e3fb086a751 Author: Linus Nordberg Date: Wed Jun 5 15:48:57 2013 +0200 Fix two cut'n'paste docu bugs. --- doc/tor.1.txt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index adcf6b7..56d163b 100644

[tor-commits] [torbutton/master] Changelog and version bump for 1.6.0.

commit 62faf3b4c8cad4183fee34b49a42e00b24a3571c Author: Mike Perry Date: Tue Jun 4 23:47:44 2013 -0700 Changelog and version bump for 1.6.0. --- src/CHANGELOG |9 + src/install.rdf |2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/C

[tor-commits] [onionoo/master] Remove 12 now unused manual A1 replacements.

commit 214524c8ff0700e7ca6357deb371a893d76db867 Author: Karsten Loesing Date: Wed Jun 5 08:27:46 2013 +0200 Remove 12 now unused manual A1 replacements. --- geoip/geoip-manual | 55 1 file changed, 55 deletions(-) diff --git a/geoip/g