[tor-commits] [obfsproxy/master] Update changelog for #5156.

[asn at torproject.org]

commit fb132ee04e8480be31c3c17aba4ff9eb27821be0
Author: George Kadianakis <desnacked at riseup.net>
Date:   Sat Mar 17 16:29:33 2012 -0700

    Update changelog for #5156.
---
 ChangeLog |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f719d58..83fbd6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ Changes in version 0.1.2 - <not yet released>
    #5157.
  - Implement obfsproxy --version. Fixes the rest of bug #5157.
  - Implement obfsproxy --help.
+ - Fix assertion failure when obfsproxy starts without network
+   connectivity. Fixes bug #5156.
 
 
 Changes in version 0.1.1 - 2012-03-09