|  Nathan Freitas | 44ab128c29 | update to OpenSSL_1_0_2k | 2017-02-28 23:01:11 -05:00 | 
				
					
						|  Nathan Freitas | cb2c5fe661 | Merge branch 'fix_bug_63' of https://github.com/arrase/orbot into arrase-fix_bug_63 Conflicts:
	app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2017-01-14 06:45:43 -05:00 | 
				
					
						|  Nathan Freitas | 19539620a9 | cache circuits by circId | 2017-01-14 06:40:25 -05:00 | 
				
					
						|  Nathan Freitas | c9fc49a2de | we want to only look up iptables once per run | 2017-01-14 06:40:10 -05:00 | 
				
					
						|  Nathan Freitas | 26b9199378 | Merge branch 'hidden_services' of https://github.com/arrase/orbot into arrase-hidden_services | 2017-01-13 22:19:02 -05:00 | 
				
					
						|  Nathan Freitas | d937b9b958 | Merge branch 'update-ant-build' of https://github.com/eighthave/orbot into eighthave-update-ant-build | 2017-01-13 22:16:59 -05:00 | 
				
					
						|  Nathan Freitas | a5744d7958 | small chnage to only check for sys iptables once | 2017-01-13 22:14:39 -05:00 | 
				
					
						|  Nathan Freitas | 970710d03c | Merge branch 'fixiptables' of https://github.com/Unpublished/orbot into Unpublished-fixiptables | 2017-01-13 22:13:10 -05:00 | 
				
					
						|  arrase | f1a8fbd6b6 | isolate | 2016-12-08 16:16:47 +01:00 | 
				
					
						|  arrase | ad68947dd4 | fix for bug 63 | 2016-12-08 16:12:29 +01:00 | 
				
					
						|  arrase | 500075454a | fix typo | 2016-12-08 15:45:16 +01:00 | 
				
					
						|  arrase | 41ebcc5050 | Deal with Doze in the less painful way | 2016-12-08 15:22:53 +01:00 | 
				
					
						|  arrase | 2aa2b4c370 | New feature added: HidServAuth manager and QR share | 2016-12-06 23:10:36 +01:00 | 
				
					
						|  arrase | 9961ad0b84 | adds padding to the hs switch | 2016-12-06 15:03:44 +01:00 | 
				
					
						|  arrase | f3af9daa55 | fix: focusable | 2016-12-06 00:52:24 +01:00 | 
				
					
						|  arrase | 4f7271b76e | feature added: temporarily disable a hidden service | 2016-12-06 00:27:25 +01:00 | 
				
					
						|  arrase | 94c68579e0 | fix untranslated arrays | 2016-12-05 22:29:33 +01:00 | 
				
					
						|  arrase | ba76f574a9 | spanish translation | 2016-12-05 22:20:47 +01:00 | 
				
					
						|  arrase | 070d615183 | center port text | 2016-12-05 21:28:33 +01:00 | 
				
					
						|  arrase | 8d5df9c9eb | better cookie dialog | 2016-12-05 21:14:15 +01:00 | 
				
					
						|  arrase | 2d0437a834 | return auth cookie at intent service | 2016-12-04 22:12:41 +01:00 | 
				
					
						|  arrase | 4d0fe27ea3 | adds optional HiddenServiceAuthorizeClient option for each hidden service | 2016-12-04 21:10:44 +01:00 | 
				
					
						|  arrase | 54e2e5e372 | fix for: https://github.com/n8fr8/orbot/issues/63 | 2016-11-29 21:04:41 +01:00 | 
				
					
						|  arrase | 07532bb04c | a better isolation of my changes | 2016-11-29 20:33:34 +01:00 | 
				
					
						|  arrase | ed5e8aca9c | fix | 2016-11-29 19:09:10 +01:00 | 
				
					
						|  Juan Ezquerro LLanes | 7a941edeee | fix | 2016-11-29 11:16:35 +01:00 | 
				
					
						|  Juan Ezquerro LLanes | dd99f8f0a3 | Merge branch 'master' into hidden_services # Conflicts:
#	app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2016-11-29 11:15:27 +01:00 | 
				
					
						|  Juan Ezquerro LLanes | 3ba1d395ea | Merge branch 'master' into hidden_services # Conflicts:
#	app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2016-11-29 11:09:49 +01:00 | 
				
					
						|  arrase | f6f4d26645 | type selection spinner | 2016-11-29 01:41:41 +01:00 | 
				
					
						|  arrase | bb5f323b71 | fix string | 2016-11-29 00:11:25 +01:00 | 
				
					
						|  arrase | 8abfba5fe5 | fix indent | 2016-11-29 00:06:59 +01:00 | 
				
					
						|  arrase | 155c18235a | feedback | 2016-11-28 23:58:55 +01:00 | 
				
					
						|  arrase | f76f58e2bf | delete files from storage | 2016-11-28 23:43:43 +01:00 | 
				
					
						|  arrase | f742b270e3 | delete by id | 2016-11-28 23:32:35 +01:00 | 
				
					
						|  arrase | 07044f7748 | confirm_service_deletion | 2016-11-28 23:25:19 +01:00 | 
				
					
						|  arrase | a0b3d72fa8 | fab icon and color | 2016-11-28 22:43:11 +01:00 | 
				
					
						|  arrase | 0bdcab134c | get data from cursor | 2016-11-28 22:25:59 +01:00 | 
				
					
						|  arrase | 7a9ad4720b | non perfect but better option to start/stop | 2016-11-28 22:06:09 +01:00 | 
				
					
						|  arrase | 9ffb0b3915 | bug fix | 2016-11-28 01:04:32 +01:00 | 
				
					
						|  arrase | 0a6d623cf7 | bug fix | 2016-11-28 00:38:26 +01:00 | 
				
					
						|  arrase | 9e0bdcf147 | bug fix | 2016-11-27 23:52:35 +01:00 | 
				
					
						|  arrase | 238a695c1b | bug fix | 2016-11-27 23:01:58 +01:00 | 
				
					
						|  arrase | 799d18cbdc | bug fix | 2016-11-27 23:00:25 +01:00 | 
				
					
						|  arrase | 1060c69623 | intent api: restore key | 2016-11-27 20:57:47 +01:00 | 
				
					
						|  arrase | bb7ffd9692 | intent api: restore key | 2016-11-27 20:07:49 +01:00 | 
				
					
						|  arrase | 5d3b171e21 | refactor | 2016-11-27 19:19:44 +01:00 | 
				
					
						|  arrase | f153600dd1 | insert or update | 2016-11-27 19:12:16 +01:00 | 
				
					
						|  arrase | 5f02561f9d | backup restore | 2016-11-27 18:50:20 +01:00 | 
				
					
						|  arrase | 130b89d846 | Write config.json | 2016-11-27 17:15:15 +01:00 | 
				
					
						|  arrase | fca54cfcdc | move hidden services to files directory | 2016-11-27 16:03:38 +01:00 |