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
..
src/main	Merge branch 'master' into hidden_services	2016-11-29 11:15:27 +01:00
build.gradle	move hidden services to files directory	2016-11-27 16:03:38 +01:00
proguard-rules.txt	add proguard rules to optimize orbot binary	2016-10-24 21:55:01 -04:00