[tor-commits] [orbot/master] Merge pull request #9 from eighthave/reboot-and-reproducible

n8fr8 at torproject.org n8fr8 at torproject.org
Thu Jun 25 14:59:58 UTC 2015


commit 541410447d80543c09cb87cef5954f3830473581
Merge: 77d1b82 2372b18
Author: n8fr8 <nathan at freitas.net>
Date:   Fri Jun 5 10:24:13 2015 -0400

    Merge pull request #9 from eighthave/reboot-and-reproducible
    
    Reboot and reproducible

 .gitignore                                         |    6 +
 .gitmodules                                        |   10 +
 BUILD                                              |    4 +-
 compare-to-official-release                        |   62 ++++++
 custom_rules.xml                                   |   57 +++++
 external/Makefile                                  |    8 +-
 fix-translations                                   |   10 +
 jenkins-build                                      |   34 +++
 make-release-build                                 |   76 +++++++
 res/drawable-hdpi-v11/ic_menu_agenda.png           |  Bin 1010 -> 0 bytes
 res/drawable-hdpi-v11/ic_menu_clear_playlist.png   |  Bin 1163 -> 0 bytes
 res/drawable-hdpi-v11/ic_stat_notify.png           |  Bin 900 -> 0 bytes
 res/drawable-hdpi-v9/ic_menu_agenda.png            |  Bin 1010 -> 0 bytes
 res/drawable-hdpi-v9/ic_menu_clear_playlist.png    |  Bin 1163 -> 0 bytes
 res/drawable-hdpi-v9/ic_stat_notify.png            |  Bin 1014 -> 0 bytes
 res/drawable-hdpi/ic_action_browse.png             |  Bin 1790 -> 0 bytes
 res/drawable-hdpi/ic_action_start.png              |  Bin 474 -> 0 bytes
 res/drawable-hdpi/ic_menu_agenda.png               |  Bin 1010 -> 0 bytes
 res/drawable-hdpi/ic_menu_clear_playlist.png       |  Bin 1163 -> 0 bytes
 res/drawable-hdpi/ic_stat_notify.png               |  Bin 1701 -> 0 bytes
 res/drawable-ldpi-v11/ic_menu_agenda.png           |  Bin 1010 -> 0 bytes
 res/drawable-ldpi-v11/ic_menu_clear_playlist.png   |  Bin 1163 -> 0 bytes
 res/drawable-ldpi-v11/ic_stat_notify.png           |  Bin 398 -> 0 bytes
 res/drawable-ldpi-v9/ic_menu_agenda.png            |  Bin 1010 -> 0 bytes
 res/drawable-ldpi-v9/ic_menu_clear_playlist.png    |  Bin 1163 -> 0 bytes
 res/drawable-ldpi-v9/ic_stat_notify.png            |  Bin 466 -> 0 bytes
 res/drawable-ldpi/ic_action_browse.png             |  Bin 729 -> 0 bytes
 res/drawable-ldpi/ic_action_start.png              |  Bin 255 -> 0 bytes
 res/drawable-ldpi/ic_menu_agenda.png               |  Bin 1010 -> 0 bytes
 res/drawable-ldpi/ic_menu_clear_playlist.png       |  Bin 1163 -> 0 bytes
 res/drawable-ldpi/ic_stat_notify.png               |  Bin 761 -> 0 bytes
 res/drawable-mdpi-v11/ic_menu_agenda.png           |  Bin 1010 -> 0 bytes
 res/drawable-mdpi-v11/ic_menu_clear_playlist.png   |  Bin 1163 -> 0 bytes
 res/drawable-mdpi-v11/ic_stat_notify.png           |  Bin 563 -> 0 bytes
 res/drawable-mdpi-v9/ic_menu_agenda.png            |  Bin 1010 -> 0 bytes
 res/drawable-mdpi-v9/ic_menu_clear_playlist.png    |  Bin 1163 -> 0 bytes
 res/drawable-mdpi-v9/ic_stat_notify.png            |  Bin 644 -> 0 bytes
 res/drawable-mdpi/ic_action_browse.png             |  Bin 1072 -> 0 bytes
 res/drawable-mdpi/ic_action_start.png              |  Bin 305 -> 0 bytes
 res/drawable-mdpi/ic_menu_agenda.png               |  Bin 1010 -> 0 bytes
 res/drawable-mdpi/ic_menu_clear_playlist.png       |  Bin 1163 -> 0 bytes
 res/drawable-mdpi/ic_stat_notify.png               |  Bin 1033 -> 0 bytes
 res/drawable-xhdpi-v11/ic_menu_agenda.png          |  Bin 1010 -> 0 bytes
 res/drawable-xhdpi-v11/ic_menu_clear_playlist.png  |  Bin 1163 -> 0 bytes
 res/drawable-xhdpi-v11/ic_stat_notify.png          |  Bin 1203 -> 0 bytes
 res/drawable-xhdpi-v9/ic_menu_agenda.png           |  Bin 1010 -> 0 bytes
 res/drawable-xhdpi-v9/ic_menu_clear_playlist.png   |  Bin 1163 -> 0 bytes
 res/drawable-xhdpi-v9/ic_stat_notify.png           |  Bin 1445 -> 0 bytes
 res/drawable-xhdpi/ic_action_browse.png            |  Bin 2616 -> 0 bytes
 res/drawable-xhdpi/ic_action_start.png             |  Bin 585 -> 0 bytes
 res/drawable-xhdpi/ic_menu_agenda.png              |  Bin 1010 -> 0 bytes
 res/drawable-xhdpi/ic_menu_clear_playlist.png      |  Bin 1163 -> 0 bytes
 res/drawable-xhdpi/ic_stat_notify.png              |  Bin 2324 -> 0 bytes
 res/drawable-xxhdpi/ic_menu_agenda.png             |  Bin 1010 -> 0 bytes
 res/drawable-xxhdpi/ic_menu_clear_playlist.png     |  Bin 1163 -> 0 bytes
 res/drawable-xxxhdpi/ic_menu_agenda.png            |  Bin 1010 -> 0 bytes
 res/drawable-xxxhdpi/ic_menu_clear_playlist.png    |  Bin 1163 -> 0 bytes
 res/drawable/bindingtile.png                       |  Bin 27503 -> 0 bytes
 res/drawable/button_stop.png                       |  Bin 1462 -> 0 bytes
 res/drawable/geometric.png                         |  Bin 4770 -> 0 bytes
 res/drawable/ic_inverse.png                        |  Bin 1027 -> 0 bytes
 res/drawable/ic_menu_agenda.png                    |  Bin 1010 -> 0 bytes
 res/drawable/ic_menu_check.png                     |  Bin 2709 -> 0 bytes
 res/drawable/ic_menu_clear_playlist.png            |  Bin 1163 -> 0 bytes
 res/drawable/ic_menu_home.png                      |  Bin 2048 -> 0 bytes
 res/drawable/ic_menu_reports.png                   |  Bin 2379 -> 0 bytes
 res/drawable/ic_menu_settings.png                  |  Bin 2905 -> 0 bytes
 res/drawable/icon_firefox.png                      |  Bin 5627 -> 0 bytes
 res/drawable/menu_settings.png                     |  Bin 1227 -> 0 bytes
 res/drawable/menu_start.png                        |  Bin 1202 -> 0 bytes
 res/drawable/nav_refresh.png                       |  Bin 3138 -> 0 bytes
 res/drawable/onion.png                             |  Bin 12877 -> 0 bytes
 res/drawable/proxymob.png                          |  Bin 11265 -> 0 bytes
 res/drawable/tor128.png                            |  Bin 16062 -> 0 bytes
 res/drawable/torerror.png                          |  Bin 14633 -> 0 bytes
 res/drawable/torstopping.png                       |  Bin 14633 -> 0 bytes
 res/drawable/txture.png                            |  Bin 56071 -> 0 bytes
 res/drawable/vidalia.png                           |  Bin 16062 -> 0 bytes
 res/drawable/warning.png                           |  Bin 2735 -> 0 bytes
 res/layout/layout_wizard_tips.xml                  |   11 +-
 res/values-ar/strings.xml                          |   26 ++-
 res/values-az/strings.xml                          |   30 +--
 res/values-bg/strings.xml                          |   30 +--
 res/values-bn-rBD/strings.xml                      |    8 +-
 res/values-bs/strings.xml                          |    8 +-
 res/values-ca/strings.xml                          |   38 ++--
 res/values-cs-rCZ/strings.xml                      |   26 +--
 res/values-cs/strings.xml                          |   14 +-
 res/values-cy/strings.xml                          |   10 +-
 res/values-da/strings.xml                          |   26 +--
 res/values-de-rAT/strings.xml                      |    8 +-
 res/values-de/strings.xml                          |   24 +--
 res/values-el/strings.xml                          |   26 +--
 res/values-en-rGB/strings.xml                      |    8 +-
 res/values-eo/strings.xml                          |   22 +-
 res/values-es-rAR/strings.xml                      |   14 +-
 res/values-es/strings.xml                          |   46 ++---
 res/values-et/strings.xml                          |   30 +--
 res/values-eu/strings.xml                          |   30 +--
 res/values-fa/strings.xml                          |   40 ++--
 res/values-fi/strings.xml                          |   28 +--
 res/values-fr-rFR/strings.xml                      |   44 ++--
 res/values-fr/strings.xml                          |   32 +--
 res/values-gl/strings.xml                          |   30 +--
 res/values-gu-rIN/strings.xml                      |    8 +-
 res/values-gu/strings.xml                          |    8 +-
 res/values-he/strings.xml                          |   20 +-
 res/values-hi/strings.xml                          |    8 +-
 res/values-hr-rHR/strings.xml                      |    8 +-
 res/values-hr/strings.xml                          |   30 +--
 res/values-hu/strings.xml                          |   42 ++--
 res/values-hy-rAM/strings.xml                      |    8 +-
 res/values-ia/strings.xml                          |    8 +-
 res/values-id-rID/strings.xml                      |   30 +--
 res/values-id/strings.xml                          |   10 +-
 res/values-is/strings.xml                          |   30 +--
 res/values-it/strings.xml                          |   30 +--
 res/values-ja/strings.xml                          |   28 +--
 res/values-ka/strings.xml                          |    8 +-
 res/values-kn-rIN/strings.xml                      |    8 +-
 res/values-kn/strings.xml                          |    8 +-
 res/values-ko/strings.xml                          |   30 +--
 res/values-ku/strings.xml                          |    8 +-
 res/values-ky/strings.xml                          |    8 +-
 res/values-lt/strings.xml                          |    8 +-
 res/values-lv/strings.xml                          |   30 +--
 res/values-mk/strings.xml                          |   20 +-
 res/values-ml/strings.xml                          |    8 +-
 res/values-mn-rMN/strings.xml                      |    8 +-
 res/values-ms-rMY/strings.xml                      |   14 +-
 res/values-ms/strings.xml                          |   14 +-
 res/values-my/strings.xml                          |    8 +-
 res/values-nb/strings.xml                          |   30 +--
 res/values-nl/strings.xml                          |   28 +--
 res/values-pa/strings.xml                          |    8 +-
 res/values-pl/strings.xml                          |   40 ++--
 res/values-pt-rBR/strings.xml                      |   30 +--
 res/values-pt/strings.xml                          |   26 +--
 res/values-ro-rRO/strings.xml                      |    8 +-
 res/values-ro/strings.xml                          |   30 +--
 res/values-rs-rAR/strings.xml                      |   10 +-
 res/values-ru/strings.xml                          |   30 +--
 res/values-si-rLK/strings.xml                      |   22 +-
 res/values-si/strings.xml                          |    8 +-
 res/values-sk-rSK/strings.xml                      |    8 +-
 res/values-sk/strings.xml                          |   10 +-
 res/values-sl/strings.xml                          |   12 +-
 res/values-sn/strings.xml                          |    8 +-
 res/values-sq-rAL/strings.xml                      |    8 +-
 res/values-sq/strings.xml                          |    8 +-
 res/values-sr/strings.xml                          |   22 +-
 res/values-sv/strings.xml                          |   30 +--
 res/values-ta/strings.xml                          |    8 +-
 res/values-te-rIN/strings.xml                      |    8 +-
 res/values-th/strings.xml                          |    8 +-
 res/values-tl/strings.xml                          |   16 +-
 res/values-tr/strings.xml                          |   34 +--
 res/values-uk/strings.xml                          |   32 +--
 res/values-ur/strings.xml                          |    8 +-
 res/values-uz/strings.xml                          |   12 +-
 res/values-vi/strings.xml                          |   26 +--
 res/values-zh-rTW/strings.xml                      |   20 +-
 res/values-zh/strings.xml                          |   42 ++--
 res/values/strings.xml                             |   21 +-
 setup-ant                                          |   28 +++
 src/org/torproject/android/service/TorService.java |  161 +++++++++------
 .../android/ui/wizard/PromoAppsActivity.java       |  218 ++++++++++++--------
 update-ant-build.sh                                |    7 -
 168 files changed, 1350 insertions(+), 999 deletions(-)





More information about the tor-commits mailing list