commit c1110309d20238e42bd8fdda0d2a96118fca6fa4 Merge: cfc8a99 4759d9f Author: n8fr8 nathan@guardianproject.info Date: Mon May 26 13:00:58 2014 -0400

Merge pull request #1 from amoghbl1/issue_2374_story_maker

Issue 2374 story maker

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(-)