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
..
src/main	Merge branch 'fix_bug_63' of https://github.com/arrase/orbot into arrase-fix_bug_63	2017-01-14 06:45:43 -05: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