[tor-commits] [tor/master] Merge remote-tracking branch 'ahf-gitlab/bugs/23551'

commit fba30b8b26a787b2e671b7d05f72449afc5a026a Merge: 411074501 c2fac2c6b Author: Nick Mathewson Date: Thu Sep 28 18:54:40 2017 -0400 Merge remote-tracking branch 'ahf-gitlab/bugs/23551' src/common/buffers.c | 2 +- src/common/compress.c | 6 +++--- src/test/test_util.c | 3 +-- 3 file

[tor-commits] [tor/master] Merge remote-tracking branch 'ahf-gitlab/bugs/23551-maint-0.3.1' into maint-0.3.1

commit 82f109c2b3cf159cd3329c4c575d737cff8e2c59 Merge: 9b0264181 8d6940814 Author: Nick Mathewson Date: Thu Sep 28 18:53:37 2017 -0400 Merge remote-tracking branch 'ahf-gitlab/bugs/23551-maint-0.3.1' into maint-0.3.1 changes/bug23551 | 3 +++ src/common/compress.c | 7 +++ 2 fil