commit 9191069891322ba4754fb160e3cc5a117b59c9bd Merge: 50b8a449b 8500f0e4e Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:28:39 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)