[tor-commits] [orbot/master] Merge branch 'master' of https://github.com/freckles-the-pirate/orbot

[n8fr8 at torproject.org]

commit a07333dfb0534e7aa2b71ea2fa1e0e426ce3d641
Merge: c013c07 a8b737a
Author: Jordan <jordannh at sent.com>
Date:   Thu Aug 14 14:38:23 2014 -0700

    Merge branch 'master' of https://github.com/freckles-the-pirate/orbot