commit fb762f6db0a363349afd83e5316daf613e27e450 Merge: c57e8da c3f04f3 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 20 13:34:02 2014 -0400 Merge remote-tracking branch 'public/bug11787' changes/bug11787 | 5 +++++ src/common/torgzip.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)