00f82f0913 
								
							 
						 
						
							
							
								
								update git submodules  
							
							
							
						 
						
							2016-02-22 13:19:15 -05:00  
				
					
						
							
							
								 
						
							
								9a8e4dd80f 
								
							 
						 
						
							
							
								
								update to orbot ant build version  
							
							
							
						 
						
							2016-02-22 12:33:12 -05:00  
				
					
						
							
							
								 
						
							
								80e8c47e62 
								
							 
						 
						
							
							
								
								peg to last ant compat release  
							
							
							
						 
						
							2016-02-22 12:09:37 -05:00  
				
					
						
							
							
								 
						
							
								043b151fb1 
								
							 
						 
						
							
							
								
								Merge branch '1984-bridges' of  https://github.com/mrphs/orbot  into dev_nima_1984_bridges  
							
							
							
						 
						
							2016-02-22 11:05:37 -05:00  
				
					
						
							
							
								 
						
							
								5eb628b03a 
								
							 
						 
						
							
							
								
								bridges dedicated to GeorgeTorwell  
							
							
							
						 
						
							2016-02-09 22:16:52 +00:00  
				
					
						
							
							
								 
						
							
								c8584f6ec9 
								
							 
						 
						
							
							
								
								update superuser commands library  
							
							
							
						 
						
							2016-02-02 12:23:58 -05:00  
				
					
						
							
							
								 
						
							
								bac16a57fc 
								
							 
						 
						
							
							
								
								enable backwards compat to Android SDK 10 (Android 2.3.*)  
							
							
							
						 
						
							2016-02-02 12:22:24 -05:00  
				
					
						
							
							
								 
						
							
								e1d46c49b9 
								
							 
						 
						
							
							
								
								reset minSDK to 10  
							
							
							
						 
						
							2016-02-02 11:35:02 -05:00  
				
					
						
							
							
								 
						
							
								3cc2439b5f 
								
							 
						 
						
							
							
								
								update license to include badvpn  
							
							
							
						 
						
							2016-01-29 17:05:29 -05:00  
				
					
						
							
							
								 
						
							
								9c82aa85d0 
								
							 
						 
						
							
							
								
								fix escaping of apostro  
							
							
							
						 
						
							2016-01-29 14:27:14 -05:00  
				
					
						
							
							
								 
						
							
								eba95b2941 
								
							 
						 
						
							
							
								
								update strings and descs from transifex  
							
							... 
							
							
							
							(somehow french got left out before!) 
							
						 
						
							2016-01-29 14:05:13 -05:00  
				
					
						
							
							
								 
						
							
								8047ec67d0 
								
							 
						 
						
							
							
								
								update the log  
							
							
							
						 
						
							2016-01-28 09:27:04 -05:00  
				
					
						
							
							
								 
						
							
								91225ab053 
								
							 
						 
						
							
							
								
								15.1.0-RC-7  
							
							
							
						 
						
							2016-01-28 09:25:41 -05:00  
				
					
						
							
							
								 
						
							
								fd45fa38f6 
								
							 
						 
						
							
							
								
								enable TransProxy and DNSPort by default without root  
							
							... 
							
							
							
							- some users run their own iptables transproxy scripts with AFWall and need Orbot to have these ports open by default. There is no risk to enable them by default, so we'll them on for now, and think about how to better make this a user option in the future. 
							
						 
						
							2016-01-28 09:24:07 -05:00  
				
					
						
							
							
								 
						
							
								b76a2504bb 
								
							 
						 
						
							
							
								
								update for RC-6...final?!  
							
							
							
						 
						
							2016-01-27 10:15:24 -05:00  
				
					
						
							
							
								 
						
							
								a8dbdacbcb 
								
							 
						 
						
							
							
								
								15.1.0-RC-6  
							
							
							
						 
						
							2016-01-27 10:14:03 -05:00  
				
					
						
							
							
								 
						
							
								eea9579ea3 
								
							 
						 
						
							
							
								
								Merge pull request  #27  from eighthave/master  
							
							... 
							
							
							
							make-release-build tweaks 
							
						 
						
							2016-01-27 10:02:08 -05:00  
				
					
						
							
							
								 
						
							
								226d92ebcd 
								
							 
						 
						
							
							
								
								make-release-build: env vars need to be first on the command line  
							
							
							
						 
						
							2016-01-27 13:31:09 +01:00  
				
					
						
							
							
								 
						
							
								20c16aec68 
								
							 
						 
						
							
							
								
								ignore more files generated by the build  
							
							
							
						 
						
							2016-01-27 13:31:09 +01:00  
				
					
						
							
							
								 
						
							
								9883a8931a 
								
							 
						 
						
							
							
								
								faketime is only needed when building, not when cleaning  
							
							... 
							
							
							
							cleaning while running faketime will just slow it down or cause weird
behavior. 
							
						 
						
							2016-01-27 09:43:56 +01:00  
				
					
						
							
							
								 
						
							
								1839b8f0b9 
								
							 
						 
						
							
							
								
								add-in missing "break" for Meek Google  
							
							
							
						 
						
							2016-01-26 18:31:04 -05:00  
				
					
						
							
							
								 
						
							
								eaa2dde611 
								
							 
						 
						
							
							
								
								explicitly indicate we are building armeabi  
							
							
							
						 
						
							2016-01-26 18:29:37 -05:00  
				
					
						
							
							
								 
						
							
								1b76c3636e 
								
							 
						 
						
							
							
								
								add make calls for both armeabi and x86 with clean  
							
							
							
						 
						
							2016-01-26 18:21:05 -05:00  
				
					
						
							
							
								 
						
							
								75eb36edb6 
								
							 
						 
						
							
							
								
								remove lib binaries  
							
							
							
						 
						
							2016-01-26 18:20:56 -05:00  
				
					
						
							
							
								 
						
							
								3be93a0eaf 
								
							 
						 
						
							
							
								
								only build for x86 and armeabi  
							
							
							
						 
						
							2016-01-26 18:20:45 -05:00  
				
					
						
							
							
								 
						
							
								2ae22ec3e4 
								
							 
						 
						
							
							
								
								update changelog for v15.10 RC-5  
							
							
							
						 
						
							2016-01-26 03:43:30 -05:00  
				
					
						
							
							
								 
						
							
								33fa19f989 
								
							 
						 
						
							
							
								
								15.1.0-RC-5  
							
							
							
						 
						
							2016-01-26 03:42:24 -05:00  
				
					
						
							
							
								 
						
							
								9b9bab3a75 
								
							 
						 
						
							
							
								
								Merge branch 'new-bridges' of  https://github.com/mrphs/orbot  into mrphs-fixes  
							
							
							
						 
						
							2016-01-25 23:53:14 -05:00  
				
					
						
							
							
								 
						
							
								25150a329c 
								
							 
						 
						
							
							
								
								Merge branch 'bug-18148' of  https://github.com/mrphs/orbot  into mrphs-fixes  
							
							
							
						 
						
							2016-01-25 23:52:59 -05:00  
				
					
						
							
							
								 
						
							
								da7eb961f1 
								
							 
						 
						
							
							
								
								small fixes to VPN service port setup to ensure proper setup  
							
							
							
						 
						
							2016-01-25 23:44:44 -05:00  
				
					
						
							
							
								 
						
							
								ec6083fcd7 
								
							 
						 
						
							
							
								
								add 'Mosaddegh','Azadi','MaBishomarim' & 'JonbesheSabz' to default bridges  
							
							
							
						 
						
							2016-01-26 04:31:37 +00:00  
				
					
						
							
							
								 
						
							
								8a00ab1f02 
								
							 
						 
						
							
							
								
								remove extra chars from bridge line.  fixes   #18148  
							
							
							
						 
						
							2016-01-26 04:19:44 +00:00  
				
					
						
							
							
								 
						
							
								d58555a358 
								
							 
						 
						
							
							
								
								one last changelog fix... argh!  
							
							
							
						 
						
							2016-01-25 22:46:21 -05:00  
				
					
						
							
							
								 
						
							
								1ba37133c5 
								
							 
						 
						
							
							
								
								fix the changelog  
							
							
							
						 
						
							2016-01-25 22:45:48 -05:00  
				
					
						
							
							
								 
						
							
								65c3fb1b3f 
								
							 
						 
						
							
							
								
								update CHANGELOG  
							
							
							
						 
						
							2016-01-25 22:44:42 -05:00  
				
					
						
							
							
								 
						
							
								80491ea95b 
								
							 
						 
						
							
							
								
								15.1.0-RC-4  
							
							
							
						 
						
							2016-01-25 22:13:12 -05:00  
				
					
						
							
							
								 
						
							
								c235e3ed6b 
								
							 
						 
						
							
							
								
								tweak the string about bridges a little bit  
							
							
							
						 
						
							2016-01-25 22:12:31 -05:00  
				
					
						
							
							
								 
						
							
								2a728140b4 
								
							 
						 
						
							
							
								
								choose up to 2 bridges from default list randomly  
							
							
							
						 
						
							2016-01-25 22:09:26 -05:00  
				
					
						
							
							
								 
						
							
								1dbe5eac55 
								
							 
						 
						
							
							
								
								make bridge allocation shuffle randomly to distribute load  
							
							... 
							
							
							
							inspired by this work: https://trac.torproject.org/projects/tor/ticket/18113 
we don't want all users to start with the same bridges in the same order 
							
						 
						
							2016-01-25 15:45:36 -05:00  
				
					
						
							
							
								 
						
							
								ba835599f7 
								
							 
						 
						
							
							
								
								this should be kbps in fact  
							
							
							
						 
						
							2016-01-25 15:45:29 -05:00  
				
					
						
							
							
								 
						
							
								cf1a644c19 
								
							 
						 
						
							
							
								
								add support for loading default bridges from asset file  
							
							
							
						 
						
							2016-01-25 12:50:03 -05:00  
				
					
						
							
							
								 
						
							
								b3a953ba64 
								
							 
						 
						
							
							
								
								15.1.0-RC-3  
							
							
							
						 
						
							2016-01-25 12:07:47 -05:00  
				
					
						
							
							
								 
						
							
								03222f2d27 
								
							 
						 
						
							
							
								
								update binaries  
							
							
							
						 
						
							2016-01-25 11:57:28 -05:00  
				
					
						
							
							
								 
						
							
								4913b0ca32 
								
							 
						 
						
							
							
								
								better implementation of stpcpy for pre-Android 21 NDK  
							
							
							
						 
						
							2016-01-25 11:57:16 -05:00  
				
					
						
							
							
								 
						
							
								ab8709dd2e 
								
							 
						 
						
							
							
								
								add orfox icon to replace orweb  
							
							
							
						 
						
							2016-01-25 11:44:33 -05:00  
				
					
						
							
							
								 
						
							
								0669addd49 
								
							 
						 
						
							
							
								
								re-add appcompat, update to latest, move to Android 23 to build  
							
							... 
							
							
							
							- this is required for latest appcompat, and to address the bug
with the white-on-white spinner popup error 
							
						 
						
							2016-01-25 11:28:33 -05:00  
				
					
						
							
							
								 
						
							
								c05d8e7b43 
								
							 
						 
						
							
							
								
								remove appcompat, and just support support-v4  
							
							
							
						 
						
							2016-01-25 10:43:34 -05:00  
				
					
						
							
							
								 
						
							
								0bbe5d5f51 
								
							 
						 
						
							
							
								
								Merge pull request  #21  from eighthave/master  
							
							... 
							
							
							
							work towards a reproducible build 
							
						 
						
							2016-01-22 19:07:28 -05:00  
				
					
						
							
							
								 
						
							
								735b2985f7 
								
							 
						 
						
							
							
								
								make-release-build: remove faketime from `ant release`  
							
							... 
							
							
							
							It is too problematic and there are other ways to make those final parts of
the APK reproducible. 
							
						 
						
							2016-01-22 23:25:55 +01:00  
				
					
						
							
							
								 
						
							
								461e35dc51 
								
							 
						 
						
							
							
								
								make-release-build: freeze time when running ndk-build  
							
							... 
							
							
							
							This aides reproducibility. 
							
						 
						
							2016-01-22 23:25:55 +01:00