From 8f1b34582771268b950a5e8a1d17cce464488331 Mon Sep 17 00:00:00 2001
From: Nathan Freitas <nathan@freitas.net>
Date: Thu, 17 Jul 2014 13:57:45 -0400
Subject: [PATCH] update for beta 2

---
 CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 43f8ab4e..069fee02 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
 NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/
 
+816d7d7 new icons for martus
+6574312 new tips for app download
+29a0641 make sure start on boot works properly
+54a39f2 only show notifications if we have data
+9d541d8 added mobile martus to rec'd apps
+4d6c32a support dynamic SOCKS ip in polipo configuration
+1cd0dcf fix proguard path for new sdk
+8cc8886 update CHANGELOG
 
 d439176 update to 14.0.5-beta
 c4cf845 handle NPE in case service disconnects