[tor-commits] [obfs-flash/master] Merge branch 'fix-w32-kill'

[infinity0 at torproject.org]

commit c2ecc7e035a81bcd9cc23784d4be5dfac963beac
Merge: a5bb87f 951616c
Author: Ximin Luo <infinity0 at torproject.org>
Date:   Tue Feb 11 14:28:38 2014 +0000

    Merge branch 'fix-w32-kill'

 obfs-flash-client |    2 ++
 setup.py          |   14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)