[tor-commits] [tor/maint-0.3.1] Correct the fix to bug 22629 to permit trailing non-garbage