commit 25f6499f6b948b59fbcb4d1ca0ddda5a0e480153 Merge: e2e0d26 c111030 Author: Nathan Freitas nathan@freitas.net Date: Fri May 30 10:37:14 2014 -0400

Merge branch 'master' of github.com:n8fr8/orbot

res/drawable/icon_story_maker.png | Bin 0 -> 4290 bytes res/layout/layout_wizard_tips.xml | 11 ++++++++++- res/values/strings.xml | 2 ++ src/org/torproject/android/wizard/TipsAndTricks.java | 12 ++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)