[tor-commits] [orbot/master] Merge branch 'build_nonPIE'
n8fr8 at torproject.org
n8fr8 at torproject.org
Mon Nov 17 21:49:30 UTC 2014
commit d70a36f64d51e20f6517b8cd11c35bd2bc9f25d4
Merge: 4fa49b3 16d8731
Author: Nathan Freitas <nathan at freitas.net>
Date: Mon Nov 17 14:12:13 2014 -0500
Merge branch 'build_nonPIE'
Conflicts:
AndroidManifest.xml
AndroidManifest.xml | 9 ++--
external/Makefile | 3 +-
res/raw/torrc | 7 +++
src/org/torproject/android/OnBootReceiver.java | 45 ++++++++++----------
.../android/service/TorServiceConstants.java | 2 +-
5 files changed, 37 insertions(+), 29 deletions(-)
More information about the tor-commits
mailing list