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
..
src	Merge branch 'master' into hidden_services	2016-11-29 11:09:49 +01:00
.gitignore	update gitignores for gradle	2016-09-19 16:09:58 -04:00
build.gradle	add RootCommands library back in for shell and root shell exec	2016-10-31 15:52:03 -04:00
proguard-rules.pro	add proguard rules to optimize orbot binary	2016-10-24 21:55:01 -04:00