commit ff0db77f91ed7d4d265bc3dd01b1d6925537f639 Merge: fcefd69b8 57e2f21bd Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 4 14:12:03 2017 -0500

Merge remote-tracking branch 'isis/bug22907'

.travis.yml | 5 +++++ changes/bug22907 | 3 +++ doc/HACKING/GettingStartedRust.md | 32 +++++++++++++++----------------- 3 files changed, 23 insertions(+), 17 deletions(-)