[tor-commits] [orbot/master] Merge pull request #158 from Unpublished/patch

[n8fr8 at torproject.org]

commit 7340e214a7bb298821afa73e4e272432a69e9024
Merge: 65bf70f2 edc07b09
Author: Nathan Freitas <nathan at freitas.net>
Date:   Mon May 21 13:03:00 2018 -0400

    Merge pull request #158 from Unpublished/patch
    
    fix proguard and stop zipping obfs4proxy and pdnsd

 BUILD                                                             | 7 +++----
 app/build.gradle                                                  | 4 ++--
 app/proguard-rules.txt                                            | 8 ++++++++
 .../java/org/torproject/android/service/util/NativeLoader.java    | 6 ++----
 4 files changed, 15 insertions(+), 10 deletions(-)