commit 2edc9cd48457169409841c794832172bc959e63a Merge: 7c3f87eb4 598210509 Author: Taylor Yu catalyst@torproject.org Date: Thu Apr 26 15:58:39 2018 -0500
Merge branch 'bug25936-031' into bug25936-032
.travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)
tor-commits@lists.torproject.org