commit 653221e807fb07ce20e70566f95c6d27c284990e Merge: 8e4daa7 7573e66 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 22 11:01:50 2014 -0400

Merge remote-tracking branch 'public/bug11824_v2'

changes/bug11824 | 5 +++++ src/common/torgzip.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)