[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm@xxxxxxxxxxxxxx]

commit 55777b3ff90311212ac3f38829229fed7b7beffe
Merge: 546f5b3 dfc0614
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jul 5 16:11:48 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 src/common/util.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)




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