Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								c7409b78c9 
								
							 
						 
						
							
							
								
								update commit pegs for external  
							
							 
							
							
							
						 
						
							2014-07-10 12:34:53 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								3bc8760beb 
								
							 
						 
						
							
							
								
								Merge branch 'new_notification_expanded' of github.com:amoghbl1/orbot-1 into amoghbl1-new_notification_expanded  
							
							 
							
							
							
						 
						
							2014-07-10 11:05:59 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								b4079f4c79 
								
							 
						 
						
							
							
								
								update transifex config  
							
							 
							
							
							
						 
						
							2014-07-10 11:04:36 -04:00  
						
					 
				
					
						
							
							
								 
								amoghbl1
							
						 
						
							 
							
							
							
							
								
							
							
								43eac85644 
								
							 
						 
						
							
							
								
								fixed merge conflicts  
							
							 
							
							
							
						 
						
							2014-06-20 02:01:17 +05:30  
						
					 
				
					
						
							
							
								 
								amoghbl1
							
						 
						
							 
							
							
							
							
								
							
							
								133922f7b4 
								
							 
						 
						
							
							
								
								updated the expanded notification ui, calls for getting exit ip implemented, exit ip added temporarily in the title of the notification till the final ui is ready. Regex to match ip address on getting response from the exit node written.  
							
							 
							
							
							
						 
						
							2014-06-18 06:02:23 +05:30  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								2fe57e84ad 
								
							 
						 
						
							
							
								
								pegging tor to 0.2.4.22  
							
							 
							
							
							
						 
						
							2014-06-11 19:33:56 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								f4baf4d6bb 
								
							 
						 
						
							
							
								
								updated to 2.0.21-stable  
							
							 
							
							
							
						 
						
							2014-06-06 14:21:55 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								816a6b2be0 
								
							 
						 
						
							
							
								
								updating to 1.1.1  
							
							 
							
							
							
						 
						
							2014-06-06 12:26:18 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								24773c302d 
								
							 
						 
						
							
							
								
								update to OpenSSL 1.0.1h  
							
							 
							
							
							
						 
						
							2014-06-06 12:22:22 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								8b5bb041d1 
								
							 
						 
						
							
							
								
								Makefile patch for Orbot  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nathan Freitas <nathan@freitas.net> 
							
						 
						
							2014-06-06 12:07:22 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								148e7eb4bf 
								
							 
						 
						
							
							
								
								remove deletion of polipo folder  
							
							 
							
							
							
						 
						
							2014-06-05 11:08:06 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								69614fb649 
								
							 
						 
						
							
							
								
								updated Tor version to 0.2.5.4-alpha  
							
							 
							
							... 
							
							
							
							heartbleed blacklists for non-updated tor nodes 
							
						 
						
							2014-05-04 00:38:29 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								05b6553cba 
								
							 
						 
						
							
							
								
								add binary stripping to makefile  
							
							 
							
							
							
						 
						
							2014-04-25 12:45:11 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								38700f9c9c 
								
							 
						 
						
							
							
								
								updated to 0.2.5.3 for scramblesuit/obfs support  
							
							 
							
							
							
						 
						
							2014-04-25 12:43:59 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								40546c9ee5 
								
							 
						 
						
							
							
								
								change from privoxy to polipo for http proxy  
							
							 
							
							
							
						 
						
							2014-04-24 23:43:33 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								4d3754bbb2 
								
							 
						 
						
							
							
								
								remove obfsproxy, update obfsclient  
							
							 
							
							
							
						 
						
							2014-04-24 12:29:49 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								7af85b5cc3 
								
							 
						 
						
							
							
								
								small updates to Makefile for NDK  
							
							 
							
							
							
						 
						
							2014-04-24 12:29:41 -04:00  
						
					 
				
					
						
							
							
								 
								Yawning Angel
							
						 
						
							 
							
							
							
							
								
							
							
								2c2d094601 
								
							 
						 
						
							
							
								
								Integrate obfsclient/liballium into the build process  
							
							 
							
							... 
							
							
							
							* Compiler/toolchain version changed to 4.8 for C++11
 * Build and package obfsclient/liballium
NB: Currently obfsclient is build with debugging information which
results in a binary that is rather large, strongly consider stripping.
Signed-off-by: Nathan Freitas <nathan@freitas.net> 
							
						 
						
							2014-04-22 22:46:52 -04:00  
						
					 
				
					
						
							
							
								 
								Yawning Angel
							
						 
						
							 
							
							
							
							
								
							
							
								43c259accc 
								
							 
						 
						
							
							
								
								Update the obfsclient submodule to include Android fixes  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nathan Freitas <nathan@freitas.net> 
							
						 
						
							2014-04-22 22:46:09 -04:00  
						
					 
				
					
						
							
							
								 
								Yawning Angel
							
						 
						
							 
							
							
							
							
								
							
							
								a6af8784ad 
								
							 
						 
						
							
							
								
								liballium/obfsclient should be sourced from tp.o repos  
							
							 
							
							... 
							
							
							
							Signed-off-by: Nathan Freitas <nathan@freitas.net> 
							
						 
						
							2014-04-22 22:45:54 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								fa6c1015d8 
								
							 
						 
						
							
							
								
								bump version to 13.0.6-RC-2  
							
							 
							
							
							
						 
						
							2014-04-15 00:26:24 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								e9d0feade0 
								
							 
						 
						
							
							
								
								updates resources and tx config for tagalog  
							
							 
							
							
							
						 
						
							2014-04-09 11:44:21 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								60a79a2ae0 
								
							 
						 
						
							
							
								
								more updates to install clean-up process  
							
							 
							
							
							
						 
						
							2014-04-08 16:09:04 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								7229c52f9c 
								
							 
						 
						
							
							
								
								updated to openssl 1.0.1g  
							
							 
							
							
							
						 
						
							2014-04-07 22:42:59 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								b734c6c232 
								
							 
						 
						
							
							
								
								add new library for superuser/shell commands  
							
							 
							
							
							
						 
						
							2014-04-07 11:10:19 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								344e914a53 
								
							 
						 
						
							
							
								
								add transifex tx config  
							
							 
							
							
							
						 
						
							2014-04-04 10:27:09 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								8140b32714 
								
							 
						 
						
							
							
								
								a little bit of cleanup of new binary installs  
							
							 
							
							
							
						 
						
							2014-04-04 10:19:23 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								cc8d3e1eab 
								
							 
						 
						
							
							
								
								update to return to binaries as ZIPd res/raw  
							
							 
							
							... 
							
							
							
							stop using the libs/armeabi hack method 
							
						 
						
							2014-04-03 23:01:39 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								8c20759bed 
								
							 
						 
						
							
							
								
								removed ABS depdency in favor of AppCompat  
							
							 
							
							
							
						 
						
							2014-04-03 21:54:26 -04:00  
						
					 
				
					
						
							
							
								 
								Daniel Martí
							
						 
						
							 
							
							
							
							
								
							
							
								75a0d34e28 
								
							 
						 
						
							
							
								
								Signed-off-by: Nathan Freitas <nathan@freitas.net>  
							
							 
							
							
							
						 
						
							2014-03-27 13:46:34 -04:00  
						
					 
				
					
						
							
							
								 
								Daniel Martí
							
						 
						
							 
							
							
							
							
								
							
							
								57ef1c3f61 
								
							 
						 
						
							
							
								
								Fix building of openssl on newer systems  
							
							 
							
							... 
							
							
							
							Forcing CC when running make works around this problem.
Signed-off-by: Nathan Freitas <nathan@freitas.net> 
							
						 
						
							2014-03-26 11:47:01 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								b5a043a6a0 
								
							 
						 
						
							
							
								
								updated Makefile to not build libevent TESTS  
							
							 
							
							
							
						 
						
							2014-03-26 11:33:58 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								dab37b576e 
								
							 
						 
						
							
							
								
								setting to 4.6 for compat  
							
							 
							
							
							
						 
						
							2014-03-24 14:45:13 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								1a346cf25e 
								
							 
						 
						
							
							
								
								updated makefile  
							
							 
							
							
							
						 
						
							2014-03-24 14:34:20 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								02c389cf28 
								
							 
						 
						
							
							
								
								updated obfsclient external  
							
							 
							
							
							
						 
						
							2014-03-24 14:20:36 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								06b46f1a35 
								
							 
						 
						
							
							
								
								updated to only build tor binary and not tests, etc  
							
							 
							
							
							
						 
						
							2014-03-24 14:18:23 -04:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								806fe40985 
								
							 
						 
						
							
							
								
								update external commit tags  
							
							 
							
							
							
						 
						
							2014-03-03 10:37:45 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								d605b45488 
								
							 
						 
						
							
							
								
								add obfsclient build but don't include binary yet  
							
							 
							
							
							
						 
						
							2014-02-22 19:19:50 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								649ca401e7 
								
							 
						 
						
							
							
								
								enable compiliation for all android not just armv7  
							
							 
							
							
							
						 
						
							2014-01-12 22:15:50 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								e24ae6cb07 
								
							 
						 
						
							
							
								
								update Makefile - try building with older toolchain  
							
							 
							
							
							
						 
						
							2014-01-09 21:15:23 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								1fa568d04c 
								
							 
						 
						
							
							
								
								peg to new repo and head with fix for empty element bug  
							
							 
							
							
							
						 
						
							2014-01-09 21:12:57 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								0b024c9efa 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/eighthave/orbot  into hans_build_patches  
							
							 
							
							... 
							
							
							
							Conflicts:
	external/Makefile 
							
						 
						
							2014-01-02 13:49:33 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								276e6c347d 
								
							 
						 
						
							
							
								
								remove old external openssl-static path  
							
							 
							
							
							
						 
						
							2013-12-29 06:17:05 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								ca28aded12 
								
							 
						 
						
							
							
								
								add patches for iptables/xtables building on Android  
							
							 
							
							
							
						 
						
							2013-12-28 09:21:13 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								76b15ddf58 
								
							 
						 
						
							
							
								
								adding new iptables/xtables build from source  
							
							 
							
							
							
						 
						
							2013-12-28 09:10:05 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								867ff53b8b 
								
							 
						 
						
							
							
								
								remove simple server source bundle  
							
							 
							
							
							
						 
						
							2013-12-27 21:44:55 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								198974a053 
								
							 
						 
						
							
							
								
								update to build openssl latest  
							
							 
							
							
							
						 
						
							2013-12-27 16:41:54 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								468076e3af 
								
							 
						 
						
							
							
								
								set to 1.0.1e release  
							
							 
							
							
							
						 
						
							2013-12-27 15:58:29 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								8666b1b4df 
								
							 
						 
						
							
							
								
								updating tor to 0.2.4.20  
							
							 
							
							
							
						 
						
							2013-12-27 15:29:03 -05:00  
						
					 
				
					
						
							
							
								 
								Nathan Freitas
							
						 
						
							 
							
							
							
							
								
							
							
								a8ca927610 
								
							 
						 
						
							
							
								
								remove simple file sharing server from build process  
							
							 
							
							
							
						 
						
							2013-12-27 13:24:15 -05:00