commit ed1d630f0e3d2d733989eefe9fce5c287a7ca6c9 Merge: 28c3f538e e3d415448 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 15 20:40:03 2018 -0500

Merge branch 'onion_ntor_malloc_less'

changes/feature25150 | 4 ++++ src/or/onion.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-)