Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								096eae705b
								
							
						 | 
						
							
							
								
								implementing http server for meek-client VPN bypass
							
							
							
							
							
						 | 
						
							2015-02-14 01:54:56 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								bff6d0f567
								
							
						 | 
						
							
							
								
								add support for meek PT
							
							
							
							
							
						 | 
						
							2015-02-14 00:44:09 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								1e5651eec3
								
							
						 | 
						
							
							
								
								improve VPN clean-up code
							
							
							
							
							
						 | 
						
							2015-02-14 00:44:02 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								a2662c325d
								
							
						 | 
						
							
							
								
								improve VPN activation
							
							
							
							
							
						 | 
						
							2015-02-14 00:43:36 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								b1294f6d60
								
							
						 | 
						
							
							
								
								improve start on boot
							
							
							
							
							
						 | 
						
							2015-02-14 00:43:13 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								266c29701d
								
							
						 | 
						
							
							
								
								update to latest pluto for meek-client
							
							
							
							
							
						 | 
						
							2015-02-14 00:42:51 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								22e75a3825
								
							
						 | 
						
							
							
								
								update pluto to latest
							
							
							
							
							
						 | 
						
							2015-02-05 10:53:55 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								431dff53a4
								
							
						 | 
						
							
							
								
								remove integrated pluto code
							
							
							
							
							
						 | 
						
							2015-02-05 10:53:21 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								70643fc29a
								
							
						 | 
						
							
							
								
								ignore more things
							
							
							
							
							
						 | 
						
							2015-02-05 09:44:45 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								33a5962fe6
								
							
						 | 
						
							
							
								
								add pluto for PT integration
							
							
							
							
							
						 | 
						
							2015-02-05 09:42:52 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								5a8aa888b1
								
							
						 | 
						
							
							
								
								add new gitmodules for orweb and pluto support
							
							
							
							
							
						 | 
						
							2015-02-05 09:42:39 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								40b8f48c66
								
							
						 | 
						
							
							
								
								set to lib_orweb branch
							
							
							
							
							
						 | 
						
							2015-02-05 09:42:30 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								c220ec9183
								
							
						 | 
						
							
							
								
								re-enable DNS settings after you start Tor
							
							
							
							
							
						 | 
						
							2015-02-04 22:02:32 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								44efced5d4
								
							
						 | 
						
							
							
								
								update build files (tmp fix for now)
							
							
							
							
							
						 | 
						
							2015-02-04 16:54:18 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								6546040921
								
							
						 | 
						
							
							
								
								v15 alpha 2
							
							
							
							
							
						 | 
						
							2015-02-04 16:54:14 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								50519d8a0b
								
							
						 | 
						
							
							
								
								ensure x86_64 case of NDK is supported
							
							
							
							
							
						 | 
						
							2015-02-04 16:29:03 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								a41367cf50
								
							
						 | 
						
							
							
								
								remove unneeded README
							
							
							
							
							
						 | 
						
							2015-02-04 16:28:56 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								9b4ef18b13
								
							
						 | 
						
							
							
								
								fix NPE for when mHandler is null
							
							
							
							
							
						 | 
						
							2015-02-04 16:28:40 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								6832363905
								
							
						 | 
						
							
							
								
								use IP instead of "localhost" name
							
							
							
							
							
						 | 
						
							2015-02-04 16:28:25 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								7f42265158
								
							
						 | 
						
							
							
								
								launch the internal or system browser depending upon VPN mode
							
							
							
							
							
						 | 
						
							2015-02-04 16:07:45 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								1852cde041
								
							
						 | 
						
							
							
								
								enable local DNS listen on 10.0.0.1 for VPN service
							
							
							
							
							
							
							
							also add support for stopping VPNBuilder instance 
							
						 | 
						
							2015-02-04 14:55:57 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								ec4350ee40
								
							
						 | 
						
							
							
								
								update VPN to toggle button
							
							
							
							
							
						 | 
						
							2015-02-04 14:55:42 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								17f2a0bdac
								
							
						 | 
						
							
							
								
								remove unused alt manifests
							
							
							
							
							
						 | 
						
							2015-02-04 12:37:04 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								9467d7db27
								
							
						 | 
						
							
							
								
								clean VPN proxy settings before startup
							
							
							
							
							
						 | 
						
							2015-02-04 12:36:42 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								5cb6cb930d
								
							
						 | 
						
							
							
								
								add back in log output temporarily in sidebar
							
							
							
							
							
						 | 
						
							2015-02-04 12:36:24 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								8dc2748520
								
							
						 | 
						
							
							
								
								remove unneeded alt manifests, fix bug in main manifest
							
							
							
							
							
						 | 
						
							2015-02-04 11:57:07 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								08c220f88e
								
							
						 | 
						
							
							
								
								clean up VPNBuilder setup code
							
							
							
							
							
						 | 
						
							2015-02-04 11:55:36 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								91a72ef5d1
								
							
						 | 
						
							
							
								
								add in basic debug output
							
							
							
							
							
						 | 
						
							2015-02-04 11:55:23 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								fb3e27bdcf
								
							
						 | 
						
							
							
								
								more clean-up of VPN service code
							
							
							
							
							
						 | 
						
							2015-02-02 16:21:04 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								5131c62c3e
								
							
						 | 
						
							
							
								
								add toolbar and drawer handlers back in
							
							
							
							
							
						 | 
						
							2015-02-02 16:20:46 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								4c49822861
								
							
						 | 
						
							
							
								
								clarify vpnprotect code and add basic debug log
							
							
							
							
							
						 | 
						
							2015-02-02 16:20:26 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								ede4128777
								
							
						 | 
						
							
							
								
								remove unused
							
							
							
							
							
						 | 
						
							2015-02-02 16:20:09 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								46aa51f4f8
								
							
						 | 
						
							
							
								
								make browser and VPN buttons enabed by default
							
							
							
							
							
						 | 
						
							2015-02-02 16:19:12 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								d6d3c5dd79
								
							
						 | 
						
							
							
								
								return app name to Orbot
							
							
							
							
							
						 | 
						
							2015-02-02 16:19:05 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								d6ea648665
								
							
						 | 
						
							
							
								
								update permissions
							
							
							
							
							
						 | 
						
							2015-02-02 16:18:50 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								d63d10d8ae
								
							
						 | 
						
							
							
								
								massive cleanup of merged code from Ony fork
							
							
							
							
							
							
							
							removal/comment out of LoggerFactory log system 
							
						 | 
						
							2015-02-02 14:01:08 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								a78e458a43
								
							
						 | 
						
							
							
								
								Merge branch 'ony-dev' into v15-dev
							
							
							
							
							
						 | 
						
							2015-02-02 13:43:54 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								5c80572264
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/SuppSandroB/Ony into ony-dev
							
							
							
							
							
							
							
							Conflicts:
	AndroidManifest.xml
	jni/Android.mk
	res/menu/main.xml
	src/org/torproject/android/OrbotMainActivity.java
	src/org/torproject/android/service/TorService.java
	src/org/torproject/android/ui/TipsAndTricks.java
	src/org/torproject/android/vpn/OrbotVpnService.java
	src/org/torproject/android/wizard/ConfigureTransProxy.java
	src/org/torproject/android/wizard/Permissions.java 
							
						 | 
						
							2015-02-02 13:42:56 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								48f40b3494
								
							
						 | 
						
							
							
								
								update resources for new design
							
							
							
							
							
						 | 
						
							2015-02-02 11:26:43 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								7c303f1589
								
							
						 | 
						
							
							
								
								refactoring into cleaner packages
							
							
							
							
							
						 | 
						
							2015-02-02 11:04:32 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								ee1d54826b
								
							
						 | 
						
							
							
								
								clean up of manifest for unused functions
							
							
							
							
							
						 | 
						
							2015-02-01 23:36:46 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								c1fe536aeb
								
							
						 | 
						
							
							
								
								add button handle logic
							
							
							
							
							
						 | 
						
							2015-02-01 23:36:19 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								753e21f367
								
							
						 | 
						
							
							
								
								update makefile for badvpn tun2socks
							
							
							
							
							
						 | 
						
							2015-02-01 23:36:07 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								cf50ec1433
								
							
						 | 
						
							
							
								
								more tweaks to new layout
							
							
							
							
							
						 | 
						
							2015-02-01 23:35:57 -05:00 | 
						
					
				
					
						
							
							
								 
								Nathan Freitas
							
						 | 
						
							
							
							
							
							
								
							
							
								6a83a0d2f6
								
							
						 | 
						
							
							
								
								update project and layout for v15 merged browser + VPN
							
							
							
							
							
						 | 
						
							2015-02-01 12:49:10 -05:00 | 
						
					
				
					
						
							
							
								 
								SandroB
							
						 | 
						
							
							
							
							
							
								
							
							
								1464901fe3
								
							
						 | 
						
							
							
								
								added badvpn as local folder
							
							
							
							
							
						 | 
						
							2015-01-25 12:08:34 +01:00 | 
						
					
				
					
						
							
							
								 
								SandroB
							
						 | 
						
							
							
							
							
							
								
							
							
								72a017369b
								
							
						 | 
						
							
							
								
								delete as it should not be as subproject
							
							
							
							
							
						 | 
						
							2015-01-25 12:06:02 +01:00 | 
						
					
				
					
						
							
							
								 
								SandroB
							
						 | 
						
							
							
							
							
							
								
							
							
								90db557cec
								
							
						 | 
						
							
							
								
								clone of badvpn for dns fix
							
							
							
							
							
						 | 
						
							2015-01-25 12:01:00 +01:00 | 
						
					
				
					
						
							
							
								 
								SandroB
							
						 | 
						
							
							
							
							
							
								
							
							
								1472b4e35d
								
							
						 | 
						
							
							
								
								some missing files added to git repo
							
							
							
							
							
						 | 
						
							2015-01-25 11:42:15 +01:00 | 
						
					
				
					
						
							
							
								 
								SandroB
							
						 | 
						
							
							
							
							
							
								
							
							
								21b75b4c56
								
							
						 | 
						
							
							
								
								vpn changes
							
							
							
							
							
						 | 
						
							2015-01-20 15:47:24 +01:00 |