commit f02c6bcad08754e0946c1ae5199cfebc9e30fe7b Merge: 0cb89eb82 7ce335c92 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 17 10:49:45 2018 -0500

Merge remote-tracking branch 'arma/bug24894' into maint-0.3.2

changes/bug24894 | 5 +++++ src/or/hs_circuit.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)