[tor-commits] [tor/maint-0.2.2] Fix typo, spotted by tmpname0901. Thanks!

2011-10-28 Thread nickm
commit f6b1dc2805ce23d4f7fddcf2714b13f718d20038 Author: Sebastian Hahn sebast...@torproject.org Date: Fri Oct 28 11:19:16 2011 +0200 Fix typo, spotted by tmpname0901. Thanks! --- changes/bug4331|4 src/or/hibernate.c |2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

[tor-commits] [tor/master] Fix typo, spotted by tmpname0901. Thanks!

2011-10-28 Thread nickm
commit f6b1dc2805ce23d4f7fddcf2714b13f718d20038 Author: Sebastian Hahn sebast...@torproject.org Date: Fri Oct 28 11:19:16 2011 +0200 Fix typo, spotted by tmpname0901. Thanks! --- changes/bug4331|4 src/or/hibernate.c |2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

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

2011-10-28 Thread nickm
commit a2517fa77c066e34d58fd50f930529b84e30946e Merge: ba91272 f6b1dc2 Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 28 09:53:23 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4331|4 src/or/hibernate.c |2 +- 2 files changed, 5

[tor-commits] [orbot/master] new values for 0.0.0.0 binding

2011-10-28 Thread n8fr8
commit 2103444e7c48187069572fcfb0a56287307fb10c Author: Nathan Freitas nat...@freitas.net Date: Thu Jun 2 16:21:25 2011 -0400 new values for 0.0.0.0 binding --- res/raw/torrc |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/res/raw/torrc b/res/raw/torrc index

[tor-commits] [orbot/master] First two wizard screens

2011-10-28 Thread n8fr8
commit de5d9bfe464be1960cbd5be194c65cf685572b51 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Mon May 30 11:01:47 2011 +0530 First two wizard screens --- AndroidManifest.xml|5 +- res/layout/scrollingtext_buttons_view.xml | 63

[tor-commits] [orbot/master] added tethering support

2011-10-28 Thread n8fr8
commit ddb4793b0a051afc9cb9f7dd5d7e7c6589ef861e Author: Nathan Freitas nat...@freitas.net Date: Thu Jun 2 16:21:50 2011 -0400 added tethering support --- src/org/torproject/android/Orbot.java | 1303 +++- .../android/boot/OnbootBroadcastReceiver.java |

[tor-commits] [orbot/master] new UI strings for tethering support

2011-10-28 Thread n8fr8
commit 422ba4bbcd66cceb51ed454f30be5882554fa570 Author: Nathan Freitas nat...@freitas.net Date: Thu Jun 2 16:21:38 2011 -0400 new UI strings for tethering support --- res/values/strings.xml |4 res/xml/preferences.xml |7 +++ 2 files changed, 11 insertions(+), 0

[tor-commits] [orbot/master] First two screens - rewrite

2011-10-28 Thread n8fr8
commit 3181d00c1d8a5b5e78dbe26da548bdb177481b04 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Fri Jun 3 23:07:30 2011 +0530 First two screens - rewrite --- AndroidManifest.xml |2 +- res/layout/scrollingtext_buttons_view.xml |8 +-

[tor-commits] [orbot/master] Permissions screen added

2011-10-28 Thread n8fr8
commit 6af2989ab82bff30ad45f14a40dfe15a4f787ddc Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Sat Jun 4 02:12:06 2011 +0530 Permissions screen added --- AUTHORS |2 +- AndroidManifest.xml |1 +

[tor-commits] [orbot/master] Added missing icons

2011-10-28 Thread n8fr8
commit 991b2d72706f093852ddbf54cef5a27b6d53dc99 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Tue Jun 7 13:04:09 2011 +0530 Added missing icons --- res/drawable/icon_firefox.png | Bin 0 - 9233 bytes res/drawable/icon_orweb.png | Bin 8783 - 0 bytes 2 files changed, 0

[tor-commits] [orbot/master] Tips and Tricks screen added

2011-10-28 Thread n8fr8
commit 22118bc38280bdf3d375018dac1c0de743b75ec0 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Mon Jun 6 02:25:18 2011 +0530 Tips and Tricks screen added --- res/drawable/icon_otrchat.png | Bin 4610 - 0 bytes res/layout/layout_wizard_tips.xml

[tor-commits] [orbot/master] Updated Permissions and Transproxy screens

2011-10-28 Thread n8fr8
commit 4f333e370d68a3606a0f39c5a610276d959ce00d Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Fri Jun 10 00:31:35 2011 +0530 Updated Permissions and Transproxy screens Included a checkbox in Permission screen to account for users who do not wish to grant root

[tor-commits] [orbot/master] Updated Transproxy screen

2011-10-28 Thread n8fr8
commit 86727d6298766816bccbd5f58e91fd58f6846786 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Thu Jun 9 01:31:32 2011 +0530 Updated Transproxy screen --- res/values/strings.xml |1 + .../torproject/android/ConfigureTransProxy.java| 81

[tor-commits] [orbot/master] TransProxy screen added

2011-10-28 Thread n8fr8
commit e7453b7f0be28c84c2f89da0ec321ad33c8a1719 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Wed Jun 8 00:32:59 2011 +0530 TransProxy screen added --- AndroidManifest.xml|1 + res/layout/layout_wizard_permissions.xml | 19

[tor-commits] [orbot/master] Fixed wizard restart on rotation

2011-10-28 Thread n8fr8
commit 0eb64792bf5911412758d0b73eff486c27172bb8 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Sat Jun 11 02:32:39 2011 +0530 Fixed wizard restart on rotation Added a SharedPreference - wizardscreen1 which when set to true shows stepOne()(Intro screen) and

[tor-commits] [orbot/master] Added proxymob icon for TipsAndTricks Screen

2011-10-28 Thread n8fr8
commit 026a7ca4c91b2cb56008d46ac0d6b612d7f58681 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Thu Jun 9 20:35:56 2011 +0530 Added proxymob icon for TipsAndTricks Screen --- res/drawable/proxymob.png | Bin 0 - 11265 bytes res/layout/layout_wizard_tips.xml |2

[tor-commits] [orbot/master] Fixed resizing issues in AppManager activity

2011-10-28 Thread n8fr8
commit 4ec2d483757016397b0bed92afdf7b14aab1af74 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Sat Jun 11 03:37:42 2011 +0530 Fixed resizing issues in AppManager activity Fixed the sizes of the icons to be 50 dip in length and width to prevent icons to be of

[tor-commits] [orbot/master] Added warning icon to Warning screen

2011-10-28 Thread n8fr8
commit 322284ef9b3b6af758ddab115685a7d688769c50 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Tue Jun 14 22:38:14 2011 +0530 Added warning icon to Warning screen --- res/drawable/warning.png | Bin 0 - 2922 bytes res/layout/scrollingtext_buttons_view.xml

[tor-commits] [orbot/master] Updated Views

2011-10-28 Thread n8fr8
commit 791a6267df0b4e001cefea9a784de00b225676a5 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Fri Jun 10 01:25:01 2011 +0530 Updated Views Added padding, formatting, etc to improve the design of the various views. --- res/layout/layout_wizard_permissions.xml

[tor-commits] [orbot/master] Calls new wizard onResume

2011-10-28 Thread n8fr8
commit 457bd78a46e52fbeae804b67b6f55501414f2f0b Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Sat Jun 11 03:45:32 2011 +0530 Calls new wizard onResume --- src/org/torproject/android/Orbot.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git

[tor-commits] [orbot/master] Wizard UI/UX Refresh

2011-10-28 Thread n8fr8
commit d937ee3ca96af9d383f1f1f8ab100ac59a9abd9d Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Mon Jun 13 01:11:46 2011 +0530 Wizard UI/UX Refresh Added theme.xml, updated all the views. Changed radiobutton logic --- res/layout/layout_apps_item.xml

[tor-commits] [orbot/master] Fixed CheckBox BUG

2011-10-28 Thread n8fr8
commit 870ce6a91d8072aa8169c7ce9bd6aadc9cb6a793 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Sat Jun 11 02:53:02 2011 +0530 Fixed CheckBox BUG Previously, the next button was not disabled when the CheckBox was unchecked. Changed it. Also, updated the logic

[tor-commits] [orbot/master] Added the AndroidManifest

2011-10-28 Thread n8fr8
commit eb3a09ae06cd7b822d1105815663a0ad254b59a6 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Mon Jun 13 01:15:44 2011 +0530 Added the AndroidManifest --- AndroidManifest.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml

[tor-commits] [orbot/master] Updated RadioButtons in ConfigureTransProxy

2011-10-28 Thread n8fr8
commit fbdeb71974a4ea3567b5f6cb7b6962ab9c5a19cf Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Mon Jun 13 15:40:34 2011 +0530 Updated RadioButtons in ConfigureTransProxy All the RadioButtons are unchecked by default. The next button is disabled until a

[tor-commits] [orbot/master] Updated TorServiceUtils.checkRootAccess()

2011-10-28 Thread n8fr8
commit e63c745808ac9020983e872c5deac190d4f884de Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Tue Jun 28 09:12:52 2011 +0530 Updated TorServiceUtils.checkRootAccess() checkRootAccess() now checks if 'su' binary and Superuser.apk exist to check if the phone has

[tor-commits] [orbot/master] updated to manifest

2011-10-28 Thread n8fr8
commit 9b3419ec3f58d423ac749e3636ff662d4ad16f6f Author: Nathan Freitas nat...@freitas.net Date: Sun Jul 24 15:38:41 2011 -0400 updated to manifest --- AndroidManifest.xml |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml

[tor-commits] [orbot/master] Updated Permissions

2011-10-28 Thread n8fr8
commit d9e0ede79743ee65ab10f1036c3ee003fa023078 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Tue Jun 28 09:14:43 2011 +0530 Updated Permissions Asks for superuser privileges after user clicks Grant Permissions and checks for iptables OWNER module ---

[tor-commits] [orbot/master] moved some pref strings to strings.xml

2011-10-28 Thread n8fr8
commit 06d6d6d01bf2135f7563815ccab899cd94e68cde Author: Nathan Freitas nat...@freitas.net Date: Mon Jul 25 10:51:50 2011 -0400 moved some pref strings to strings.xml --- res/xml/preferences.xml | 19 --- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git

[tor-commits] [orbot/master] fixed and cleaned up file path issues with binary installs and execution

2011-10-28 Thread n8fr8
commit 7a1c0f322408f9415acd1a4dce0513247c89b40f Author: Nathan Freitas nat...@freitas.net Date: Mon Jul 25 16:12:41 2011 -0400 fixed and cleaned up file path issues with binary installs and execution --- .../android/service/TorBinaryInstaller.java| 151 +---

[tor-commits] [orbot/master] new version info and log entries

2011-10-28 Thread n8fr8
commit 45bfee56e01b51c1e3a0bbe22f514a19bf9cf9ee Author: Nathan Freitas nat...@freitas.net Date: Mon Jul 25 11:10:47 2011 -0400 new version info and log entries --- AndroidManifest.xml |2 +- CHANGELOG |2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git

[tor-commits] [orbot/master] updated BUILD info to add split command for tor binary

2011-10-28 Thread n8fr8
commit 6afb5da06abcea9709f7352a306bf026a141cec9 Author: Nathan Freitas nat...@freitas.net Date: Mon Jul 25 17:35:39 2011 -0400 updated BUILD info to add split command for tor binary --- BUILD |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/BUILD b/BUILD

[tor-commits] [orbot/master] updated tor version number

2011-10-28 Thread n8fr8
commit e86e1d92f299fd26910b070cc918d84f7b62021b Author: Nathan Freitas nat...@freitas.net Date: Mon Jul 25 17:35:51 2011 -0400 updated tor version number --- AndroidManifest.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml

[tor-commits] [orbot/master] updated tor binary segments to 0.2.3.1-alpah

2011-10-28 Thread n8fr8
commit 2cc235077ea01dc8c4158814341634600a36aa01 Author: Nathan Freitas nat...@freitas.net Date: Mon Jul 25 17:25:49 2011 -0400 updated tor binary segments to 0.2.3.1-alpah --- res/raw/toraa | Bin 1048576 - 1048576 bytes res/raw/torab | Bin 1048576 - 1048576 bytes res/raw/torac | Bin

[tor-commits] [orbot/master] updating project files

2011-10-28 Thread n8fr8
commit d6692610e407216eefa80e620ead193110bcec9e Author: Nathan Freitas nat...@freitas.net Date: Fri Oct 28 11:25:12 2011 -0400 updating project files --- .classpath |1 + AndroidManifest.xml | 19 ++- 2 files changed, 11 insertions(+), 9 deletions(-) diff

[tor-commits] [orbot/master] adding in whispercore library to support their iptables API

2011-10-28 Thread n8fr8
commit 20c0e08c6445084c155bc0ea2615e0153d8d2fd6 Author: Nathan Freitas nat...@freitas.net Date: Fri Oct 28 00:33:32 2011 -0400 adding in whispercore library to support their iptables API --- libs/whispercore.jar | Bin 0 - 9849 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff

[tor-commits] [orbot/master] new graphics. woot.

2011-10-28 Thread n8fr8
commit fa313c700a745c57144e2601876965d6c37ce344 Author: Nathan Freitas nat...@freitas.net Date: Fri Oct 28 00:32:18 2011 -0400 new graphics. woot. --- res/drawable/error.png | Bin 0 - 2922 bytes res/drawable/icon_orweb.png | Bin 0 - 8783 bytes 2 files changed, 0 insertions(+), 0

[tor-commits] [orbot/master] updated build instructions

2011-10-28 Thread n8fr8
commit 65b94d169256ac3078f29ef7360a48a608f616ee Author: Nathan Freitas nat...@freitas.net Date: Fri Oct 28 11:00:26 2011 -0400 updated build instructions --- BUILD | 15 --- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/BUILD b/BUILD index b22aec4..c4795ca

[tor-commits] [orbot/master] finalizing packages for wizard and new config options

2011-10-28 Thread n8fr8
commit adbf7be054adb83dd90e8504a5f2baa38e2fe775 Author: Nathan Freitas nat...@freitas.net Date: Fri Oct 28 00:31:45 2011 -0400 finalizing packages for wizard and new config options --- .../torproject/android/service/TorrcConfig.java| 33 ++

[tor-commits] [orbot/master] updated layout, strings, and graphics

2011-10-28 Thread n8fr8
commit def974fa958c44d930047fb48122f472d4fe0301 Author: Nathan Freitas nat...@freitas.net Date: Fri Oct 28 00:31:26 2011 -0400 updated layout, strings, and graphics --- res/drawable/ic_launcher_gibberbot.png| Bin 7527 - 6365 bytes res/drawable/tor.png | Bin 6682

[tor-commits] [orbot/master] added support for unpacking split binary into one tor exe; supports devices with 1M raw resource limit

2011-10-28 Thread n8fr8
commit 0bfad80ca64fa205bd7d9b36acf7e8b49601d732 Author: Nathan Freitas nat...@freitas.net Date: Mon Jul 25 10:50:03 2011 -0400 added support for unpacking split binary into one tor exe; supports devices with 1M raw resource limit --- .../android/service/TorBinaryInstaller.java|

[tor-commits] [orbot/master] removed version string from resources; now dynamic

2011-10-28 Thread n8fr8
commit f74ebfc75af82255e7bf1ffcfde2a99af46f0880 Author: Nathan Freitas nat...@freitas.net Date: Mon Jul 25 10:50:56 2011 -0400 removed version string from resources; now dynamic --- res/values-ar/strings.xml |1 - res/values-ca/strings.xml |1 - res/values-de/strings.xml |1 -

[tor-commits] [orbot/master] updated version for tethering

2011-10-28 Thread n8fr8
commit 8dffdba34fb0b540eebe59f9e06a89bbfea0e154 Author: Nathan Freitas nat...@freitas.net Date: Sun Jul 24 14:29:42 2011 -0400 updated version for tethering --- AndroidManifest.xml |2 +- CHANGELOG |3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git

[tor-commits] [orbot/master] Minor changes to LotsaText.java

2011-10-28 Thread n8fr8
commit d7c15dd81bead96956cd5164c287c2729b60f409 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Tue Jun 28 09:20:01 2011 +0530 Minor changes to LotsaText.java Now shows Introduction screen when the app is installed for the first time. ---

[tor-commits] [orbot/master] Merge branch 'wizard'

2011-10-28 Thread n8fr8
commit cd6c533a7189a126384377f0d4e8bc2f700f776f Merge: 9b3419e d7c15dd Author: Nathan Freitas nat...@freitas.net Date: Sun Jul 24 17:09:30 2011 -0400 Merge branch 'wizard' Conflicts: res/values/strings.xml src/org/torproject/android/Orbot.java AUTHORS

[tor-commits] [orbot/master] Merge branch 'tethering'

2011-10-28 Thread n8fr8
commit 6a4388de28ed62fd9ff4525c4164f38a53e55f60 Merge: 73b6a06 8dffdba Author: Nathan Freitas nat...@freitas.net Date: Sun Jul 24 14:31:02 2011 -0400 Merge branch 'tethering' AndroidManifest.xml|2 +- CHANGELOG |

[tor-commits] [torbrowser/maint-2.3] update recommended-versions to only recommend 2.2.34-1

2011-10-28 Thread erinn
commit 9345bc883114d3c11745def33e9ea02181634109 Author: Erinn Clark er...@torproject.org Date: Fri Oct 28 16:39:46 2011 +0100 update recommended-versions to only recommend 2.2.34-1 --- build-scripts/recommended-versions | 10 -- 1 files changed, 0 insertions(+), 10 deletions(-)

[tor-commits] [torbrowser/maint-2.2] update recommended-versions to only recommend 2.2.34-1

2011-10-28 Thread erinn
commit 9345bc883114d3c11745def33e9ea02181634109 Author: Erinn Clark er...@torproject.org Date: Fri Oct 28 16:39:46 2011 +0100 update recommended-versions to only recommend 2.2.34-1 --- build-scripts/recommended-versions | 10 -- 1 files changed, 0 insertions(+), 10 deletions(-)

[tor-commits] [torbrowser/master] update recommended-versions to only recommend 2.2.34-1

2011-10-28 Thread erinn
commit 9345bc883114d3c11745def33e9ea02181634109 Author: Erinn Clark er...@torproject.org Date: Fri Oct 28 16:39:46 2011 +0100 update recommended-versions to only recommend 2.2.34-1 --- build-scripts/recommended-versions | 10 -- 1 files changed, 0 insertions(+), 10 deletions(-)

[tor-commits] [stem/master] Putting stem under the LGPL v3

2011-10-28 Thread atagar
commit 52be689448931b1eca7de3add345f9aa2d79319f Author: Damian Johnson ata...@torproject.org Date: Thu Oct 27 19:43:45 2011 -0700 Putting stem under the LGPL v3 --- LICENSE | 165 +++ 1 files changed, 165 insertions(+), 0

[tor-commits] [stem/master] Merging version constructor and parser

2011-10-28 Thread atagar
commit 63a9a5fa524e352c94bab7beabd5052e4972c6c4 Author: Damian Johnson ata...@torproject.org Date: Thu Oct 27 20:31:43 2011 -0700 Merging version constructor and parser The version constructor wasn't really useful so merging it with the get_version function to make its usage

[tor-commits] [translation/tsum] Update translations for tsum

2011-10-28 Thread translation
commit 4a4c7f35985a9887cce59f46e769f727c9871db1 Author: Translation commit bot translat...@torproject.org Date: Fri Oct 28 16:46:34 2011 + Update translations for tsum --- tr_TR/tsum.po | 578 + 1 files changed, 578

[tor-commits] [tor/maint-0.2.2] Discard all cells on a marked connection

2011-10-28 Thread nickm
commit cf8bffa35901a26ae840dcd715dd2f664259efb3 Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 28 17:04:15 2011 -0400 Discard all cells on a marked connection Fix for bug 4299 --- changes/bug4299 |5 + src/or/command.c |6 ++ 2 files changed, 11

[tor-commits] [tor/master] Fix a double-free that would occur on an invalid cert in a CERTS cell

2011-10-28 Thread nickm
commit c2a098e9800edb27d6a3630337e0efa72dfa7ba2 Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 28 16:38:56 2011 -0400 Fix a double-free that would occur on an invalid cert in a CERTS cell We would stash the certs in the handshake state before checking them for

[tor-commits] [tor/master] Fix a memory-poisoning memset in tortls.c

2011-10-28 Thread nickm
commit 7a8960cf1b34d27db0ffe0929c1810800f319c86 Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 28 16:37:42 2011 -0400 Fix a memory-poisoning memset in tortls.c --- src/common/tortls.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/tortls.c

[tor-commits] [tor/master] Authetnicate is not the usual spelling

2011-10-28 Thread nickm
commit 2018f86e0c7f088de54ff8f7f4d1e04075785206 Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 28 16:41:04 2011 -0400 Authetnicate is not the usual spelling --- src/or/command.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/command.c

[tor-commits] [tor/master] Discard all cells on a marked connection

2011-10-28 Thread nickm
commit cf8bffa35901a26ae840dcd715dd2f664259efb3 Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 28 17:04:15 2011 -0400 Discard all cells on a marked connection Fix for bug 4299 --- changes/bug4299 |5 + src/or/command.c |6 ++ 2 files changed, 11

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

2011-10-28 Thread nickm
commit 212c3acd42285b77ae8197a185cbb00fea2c8926 Merge: a2517fa cf8bffa Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 28 18:02:57 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/command.c changes/bug4299 |5 +

[tor-commits] [tor/master] Merge branch 'bug4343'

2011-10-28 Thread nickm
commit 4dd8d811d669e245f95ed0fcc59de579e876ab91 Merge: 00a0de8 2018f86 Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 28 18:05:25 2011 -0400 Merge branch 'bug4343' changes/bug4343 |5 + src/common/tortls.c |2 +- src/or/command.c|6 +++--- 3 files

[tor-commits] [tor/master] Bump version to 0.2.3.6-alpha-dev

2011-10-28 Thread nickm
commit 00a0de8508f4cb5ab28b91884c3ca1733e2a174f Author: Nick Mathewson ni...@torproject.org Date: Fri Oct 28 18:05:17 2011 -0400 Bump version to 0.2.3.6-alpha-dev --- configure.in |2 +- contrib/tor-mingw.nsi.in |2 +- src/win32/orconfig.h |2 +- 3 files