commit 392e5457b86fdaeae5d15ead5ff75f021c730549 Merge: 9452561 25edb41 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 20 13:35:38 2017 -0400

Merge remote-tracking branch 'argonblue/bug22638' into maint-0.3.1

src/common/compress_none.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)