commit 1a907c659378b1748e65f8d94f7d212a91122247
Merge: 431c8d09e cc4c1840a
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed Jul 26 15:37:53 2017 -0400
Merge branch 'maint-0.3.0' into maint-0.3.1
This is an "ours" merge to avoid taking any changs from maint-0.3.0:
we don't want to take the travis file, since there is a separate branch
for putting it in 0.3.1 and later.
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
