commit e459ec0913f7735f957a7cde4abf5697127d96e5 Merge: a3f16974 eddcba62 Author: lexi bird.s.lex@gmail.com Date: Tue Feb 27 15:13:33 2018 -0500

Merge branch 'master' into vpn-app-selection-ui-improvements

INSTALL | 2 +- orbotservice/src/main/jni/Android.mk | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)