commit 6f2657dbcf81c8f78acb49d487075e66ec9be3c2 Merge: a535735 d9427c0 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 29 18:44:53 2017 -0400
Merge branch 'maint-0.3.0' into maint-0.3.1
"ours" merge to avoid version bump.
tor-commits@lists.torproject.org