commit b2625b09f1e455d9a2a3704ae50d968276d170ac Merge: e1273d7d1 633813e31 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 11 10:00:22 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/ticket24803 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)