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 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								bf92bd1cf3
								
							
						 | 
						
							
							
								
								updated default string values
							
							
							
							
							
						 | 
						
							2012-02-12 01:26:54 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								7ea8342967
								
							
						 | 
						
							
							
								
								added new pref string key
							
							
							
							
							
						 | 
						
							2012-02-12 01:25:41 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								bfaf01203e
								
							
						 | 
						
							
							
								
								tweaked bindService call
							
							
							
							
							
						 | 
						
							2012-02-12 01:25:33 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								ebb7535b0f
								
							
						 | 
						
							
							
								
								improved logging of cmd exec
							
							
							
							
							
						 | 
						
							2012-02-12 01:25:02 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								258217d031
								
							
						 | 
						
							
							
								
								added support for obfsproxy start/stop/kill
							
							
							
							
							
						 | 
						
							2012-02-12 01:24:28 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								411dcea837
								
							
						 | 
						
							
							
								
								added app class to handle language settings
							
							
							
							
							
						 | 
						
							2012-02-12 01:23:29 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								a809eb9aa0
								
							
						 | 
						
							
							
								
								added new default values for obfs bridges
							
							
							
							
							
						 | 
						
							2012-02-12 01:23:03 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								5c6f58cf57
								
							
						 | 
						
							
							
								
								added new class for OrbotApp
							
							
							
							
							
						 | 
						
							2012-02-12 01:22:43 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								98029168fb
								
							
						 | 
						
							
							
								
								new file for background binary check
							
							
							
							
							
						 | 
						
							2012-02-11 22:42:34 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								c68d8c3a45
								
							
						 | 
						
							
							
								
								adding compressed tor binary as mp3 - don't ask!
							
							
							
							
							
						 | 
						
							2012-02-11 22:41:58 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								790acb8a53
								
							
						 | 
						
							
							
								
								updated way for checking for ROOT
							
							
							
							
							
						 | 
						
							2012-02-11 22:41:25 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								3ea0d1dcc1
								
							
						 | 
						
							
							
								
								added HOME export setting for obfsproxy
							
							
							
							
							
						 | 
						
							2012-02-11 22:41:10 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								a2653393b0
								
							
						 | 
						
							
							
								
								added filter for bridge and bridge+obfs urls
							
							
							
							
							
						 | 
						
							2012-02-11 22:40:53 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								d22ef2b1c5
								
							
						 | 
						
							
							
								
								added installer for obfsproxy binary
							
							
							
							
							
						 | 
						
							2012-02-11 22:39:10 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								834188a22e
								
							
						 | 
						
							
							
								
								updating binaries and config files
							
							
							
							
							
						 | 
						
							2012-02-11 22:38:32 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								2c9d686476
								
							
						 | 
						
							
							
								
								added, updated binaries and torrc
							
							
							
							
							
						 | 
						
							2012-02-11 04:06:57 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								a73d8eea29
								
							
						 | 
						
							
							
								
								adding project properties files
							
							
							
							
							
						 | 
						
							2012-01-27 11:01:32 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								7b035dfad7
								
							
						 | 
						
							
							
								
								updated to build version 32
							
							
							
							
							
						 | 
						
							2012-01-27 11:00:42 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								9c4e675749
								
							
						 | 
						
							
							
								
								updated to 1.0.7-FINAL
							
							
							
							
							
						 | 
						
							2012-01-27 11:00:18 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								e91e34ede2
								
							
						 | 
						
							
							
								
								added ant build script and proguard opt
							
							
							
							
							
						 | 
						
							2012-01-27 11:00:07 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								ac9ef0805c
								
							
						 | 
						
							
							
								
								updated
							
							
							
							
							
						 | 
						
							2012-01-25 21:14:15 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								e4bedd19cf
								
							
						 | 
						
							
							
								
								updated version
							
							
							
							
							
						 | 
						
							2012-01-25 20:11:35 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								b1a02fb26d
								
							
						 | 
						
							
							
								
								added support back in for SDK4/Android 1.6
							
							
							
							
							
						 | 
						
							2012-01-25 20:10:42 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								7410be6389
								
							
						 | 
						
							
							
								
								added persist notify pref string
							
							
							
							
							
						 | 
						
							2012-01-25 20:10:09 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								24b9b673d0
								
							
						 | 
						
							
							
								
								removed whisper binary
							
							
							
							
							
						 | 
						
							2012-01-25 20:09:53 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								1a7afea671
								
							
						 | 
						
							
							
								
								added pref for persist notifications
							
							
							
							
							
						 | 
						
							2012-01-25 20:09:44 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								493d6e22cd
								
							
						 | 
						
							
							
								
								cleaned up binding and logging
							
							
							
							
							
						 | 
						
							2012-01-25 20:09:33 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								5dae040303
								
							
						 | 
						
							
							
								
								support zip file raw assets
							
							
							
							
							
						 | 
						
							2012-01-25 20:07:15 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								f1d6934ee3
								
							
						 | 
						
							
							
								
								cleaned up override syntax
							
							
							
							
							
						 | 
						
							2012-01-25 20:06:44 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								857c302247
								
							
						 | 
						
							
							
								
								cleaned up override settings
							
							
							
							
							
						 | 
						
							2012-01-25 20:06:25 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								e6d65dbae9
								
							
						 | 
						
							
							
								
								removed whispersys stuff for now
							
							
							
							
							
						 | 
						
							2012-01-25 20:06:09 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								08a0376410
								
							
						 | 
						
							
							
								
								cleaned up notify icons
							
							
							
							
							
						 | 
						
							2012-01-25 20:05:43 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								bab5183818
								
							
						 | 
						
							
							
								
								new pref constants
							
							
							
							
							
						 | 
						
							2012-01-25 20:05:30 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								1e3f6bbddf
								
							
						 | 
						
							
							
								
								opt persistent notifications & geoip not default
							
							
							
							
							
						 | 
						
							2012-01-25 20:04:41 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								63c4e97355
								
							
						 | 
						
							
							
								
								minor code format change
							
							
							
							
							
						 | 
						
							2012-01-25 20:03:54 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								b225703988
								
							
						 | 
						
							
							
								
								updated version
							
							
							
							
							
						 | 
						
							2012-01-16 23:41:50 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								71e79ea56c
								
							
						 | 
						
							
							
								
								updated version string in text for about dialog
							
							
							
							
							
						 | 
						
							2012-01-16 23:41:38 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								93f242d66b
								
							
						 | 
						
							
							
								
								solved NPE issue for null intent
							
							
							
							
							
						 | 
						
							2012-01-16 23:41:25 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								512f3d6dbd
								
							
						 | 
						
							
							
								
								cleanup notifications; fixes for binary checking
							
							
							
							
							
						 | 
						
							2012-01-16 22:56:50 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								d35fb1bda2
								
							
						 | 
						
							
							
								
								cleanup of binding and starting TorService
							
							
							
							
							
						 | 
						
							2012-01-16 22:56:26 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								b03cd1a57f
								
							
						 | 
						
							
							
								
								updated version, minSDK = 8 or 2.2
							
							
							
							
							
						 | 
						
							2012-01-16 22:55:25 -05:00 |