[tor-commits] [tor/master] Merge remote-tracking branch 'arma/feature18998'

[nickm at torproject.org]

commit 84af12e9dbbfb166ee37fd75691e9e7f96dbad5d
Merge: 6678dff be0e1e9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 9 21:10:17 2016 -0400

    Merge remote-tracking branch 'arma/feature18998'

 changes/feature18998 | 5 +++++
 src/or/rendmid.c     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)