[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm@xxxxxxxxxxxxxx]

commit 58f54a3588cf722a31b10fa0450225f7685c8629
Merge: 85cd8386f 7c3f87eb4
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Apr 25 08:01:54 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 src/or/router.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits