n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								4589257366
								
							
						 | 
						
							
							
								
								new external dependency (tor, privoxy) makefile
							
							
							
							
							
						 | 
						
							2012-05-03 18:29:28 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								94e60283b4
								
							
						 | 
						
							
							
								
								updated project to 15
							
							
							
							
							
						 | 
						
							2012-05-03 15:19:18 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								8ba946e1fd
								
							
						 | 
						
							
							
								
								updated to platform 15
							
							
							
							
							
						 | 
						
							2012-05-03 15:09:55 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								f7cf202b00
								
							
						 | 
						
							
							
								
								updated makefile to fix path issues
							
							
							
							
							
						 | 
						
							2012-05-03 15:07:02 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								8f1c0e6abb
								
							
						 | 
						
							
							
								
								checked out tor-0.2.3.15-alpha
							
							
							
							
							
						 | 
						
							2012-05-03 15:06:21 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								00739d5854
								
							
						 | 
						
							
							
								
								switched to release-1.4.14-stable tag
							
							
							
							
							
						 | 
						
							2012-05-03 14:55:15 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								3af53507f9
								
							
						 | 
						
							
							
								
								checked out tag release-2.0.18-stable
							
							
							
							
							
						 | 
						
							2012-05-03 14:45:28 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								01beff0322
								
							
						 | 
						
							
							
								
								adding in git submodules info
							
							
							
							
							
						 | 
						
							2012-05-03 14:33:05 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								408c76593b
								
							
						 | 
						
							
							
								
								adding in git submodule links
							
							
							
							
							
						 | 
						
							2012-05-03 14:32:37 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								7807415438
								
							
						 | 
						
							
							
								
								adding in privoxy directly to Orbot repo
							
							
							
							
							
						 | 
						
							2012-05-03 14:32:18 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								f730245681
								
							
						 | 
						
							
							
								
								removed android building from Makefile
							
							
							
							
							
						 | 
						
							2012-05-03 08:42:41 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								4a88bf782b
								
							
						 | 
						
							
							
								
								updated build file for latest SDK
							
							
							
							
							
						 | 
						
							2012-05-02 23:37:09 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								6b70bbcd60
								
							
						 | 
						
							
							
								
								project updates
							
							
							
							
							
						 | 
						
							2012-05-02 23:36:47 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								ca9ac3a921
								
							
						 | 
						
							
							
								
								clean libs directory
							
							
							
							
							
						 | 
						
							2012-05-02 23:36:31 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								7f57a91d51
								
							
						 | 
						
							
							
								
								removing binary privoxy
							
							
							
							
							
						 | 
						
							2012-05-02 23:35:57 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								0d0b325b1d
								
							
						 | 
						
							
							
								
								new 'one click' build script for NDK and SDK
							
							
							
							
							
						 | 
						
							2012-05-02 23:35:29 -04:00 | 
						
					
				
					
						
							
							
								 
								n8fr8
							
						 | 
						
							
							
							
							
							
								
							
							
								14eb59b705
								
							
						 | 
						
							
							
								
								removed binaries
							
							
							
							
							
						 | 
						
							2012-05-02 13:39:40 -04:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								a7320ea477
								
							
						 | 
						
							
							
								
								moving versioning to 1.0.8
							
							
							
							
							
						 | 
						
							2012-04-08 23:25:35 -04:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								d11a6c6f75
								
							
						 | 
						
							
							
								
								cleaned up tor control cookie file code for #5305
							
							
							
							
							
						 | 
						
							2012-04-08 23:22:54 -04:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								1cb7ed5a6c
								
							
						 | 
						
							
							
								
								udpated build targets to v11
							
							
							
							
							
						 | 
						
							2012-02-27 06:50:54 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								e3da83657b
								
							
						 | 
						
							
							
								
								extrnlz more strings; added ActionBar support
							
							
							
							
							
						 | 
						
							2012-02-27 06:50:35 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								82deb40dae
								
							
						 | 
						
							
							
								
								fixed issue with network conn on main thread
							
							
							
							
							
						 | 
						
							2012-02-26 23:38:34 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								12ee3d6033
								
							
						 | 
						
							
							
								
								updated lang selection list
							
							
							
							
							
						 | 
						
							2012-02-26 23:20:03 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								3fc88782f0
								
							
						 | 
						
							
							
								
								new menu xml
							
							
							
							
							
						 | 
						
							2012-02-26 22:59:10 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								b6f6d79001
								
							
						 | 
						
							
							
								
								updated project settings
							
							
							
							
							
						 | 
						
							2012-02-26 22:49:06 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								d1721d4164
								
							
						 | 
						
							
							
								
								added new wizard activitiy; UI tweaks for ICS
							
							
							
							
							
						 | 
						
							2012-02-26 22:48:49 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								332bf93ffd
								
							
						 | 
						
							
							
								
								added locale selection pref capability
							
							
							
							
							
						 | 
						
							2012-02-26 22:48:30 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								697f5aa2f1
								
							
						 | 
						
							
							
								
								fixed OnBoot issue with unintended service starting
							
							
							
							
							
						 | 
						
							2012-02-26 22:47:25 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								36a2348813
								
							
						 | 
						
							
							
								
								updated strings for menus and wizard
							
							
							
							
							
						 | 
						
							2012-02-26 22:47:06 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								09be8ff5d1
								
							
						 | 
						
							
							
								
								new graphics for menus
							
							
							
							
							
						 | 
						
							2012-02-26 22:46:54 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								c9b8d83c45
								
							
						 | 
						
							
							
								
								updated wizard layouts for localization
							
							
							
							
							
						 | 
						
							2012-02-26 22:46:32 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								16ef8e8f59
								
							
						 | 
						
							
							
								
								fixed Orbat typo
							
							
							
							
							
						 | 
						
							2012-02-26 22:46:21 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								6a32a53d12
								
							
						 | 
						
							
							
								
								added new language chooser for wizard
							
							
							
							
							
						 | 
						
							2012-02-26 22:45:55 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								36f1510b8b
								
							
						 | 
						
							
							
								
								adding in new arrays for locale menus
							
							
							
							
							
						 | 
						
							2012-02-24 00:17:37 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								a773ff35f8
								
							
						 | 
						
							
							
								
								updated version 1.0.7.2 and project info
							
							
							
							
							
						 | 
						
							2012-02-24 00:13:49 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								3a9a269296
								
							
						 | 
						
							
							
								
								updates for manually setting locales
							
							
							
							
							
						 | 
						
							2012-02-24 00:13:27 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								b4952ea44d
								
							
						 | 
						
							
							
								
								removed unused old wizard class
							
							
							
							
							
						 | 
						
							2012-02-23 14:37:46 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								befd79c4b9
								
							
						 | 
						
							
							
								
								fixed pt_br naming, adding in obfs bridge strings
							
							
							
							
							
						 | 
						
							2012-02-23 14:37:27 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								db094d5306
								
							
						 | 
						
							
							
								
								removed unused old wizard layout
							
							
							
							
							
						 | 
						
							2012-02-23 14:37:02 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								6e1a907a78
								
							
						 | 
						
							
							
								
								not much here yet
							
							
							
							
							
						 | 
						
							2012-02-23 14:24:18 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								595cd7e383
								
							
						 | 
						
							
							
								
								updated translations from transifex
							
							
							
							
							
						 | 
						
							2012-02-23 14:23:41 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								dda8dd9b1c
								
							
						 | 
						
							
							
								
								updates to build, changelog info for obfsproxy
							
							
							
							
							
						 | 
						
							2012-02-13 07:32:16 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								78a00d9e26
								
							
						 | 
						
							
							
								
								updated version
							
							
							
							
							
						 | 
						
							2012-02-13 07:30:05 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								0cf708f98d
								
							
						 | 
						
							
							
								
								set default bridge obfs mode to true
							
							
							
							
							
						 | 
						
							2012-02-13 07:28:50 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								f255420782
								
							
						 | 
						
							
							
								
								Merge branch 'kensan/obfsbridge-prefs' into obfs
							
							
							
							
							
							
							
							Conflicts:
	src/org/torproject/android/service/TorService.java 
							
						 | 
						
							2012-02-12 13:05:19 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								48ea51ff8e
								
							
						 | 
						
							
							
								
								cleaned up locale, set default to EN
							
							
							
							
							
						 | 
						
							2012-02-12 12:29:30 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								3f3e091a54
								
							
						 | 
						
							
							
								
								moved bridge config out of torrc into applyPrefs()
							
							
							
							
							
						 | 
						
							2012-02-12 12:29:11 -05:00 | 
						
					
				
					
						
							
							
								 
								Adrian-Ken Rueegsegger
							
						 | 
						
							
							
							
							
							
								
							
							
								ab4f789eff
								
							
						 | 
						
							
							
								
								Add correct torrc entries for obfuscated bridges
							
							
							
							
							
							
							
							The lines have the following form:
Bridge obfs2 ${IP address of bridge}
...
ClientTransportPlugin obfs2 exec ${/path/to/obfsproxy} --managed
							
						 | 
						
							2012-02-12 13:28:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Adrian-Ken Rueegsegger
							
						 | 
						
							
							
							
							
							
								
							
							
								c21be28cf3
								
							
						 | 
						
							
							
								
								Add constants related to obfuscated bridges
							
							
							
							
							
						 | 
						
							2012-02-12 13:28:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Adrian-Ken Rueegsegger
							
						 | 
						
							
							
							
							
							
								
							
							
								c7e55cac62
								
							
						 | 
						
							
							
								
								Add strings and prefs related to obfuscated bridges
							
							
							
							
							
						 | 
						
							2012-02-12 13:19:34 +01:00 |