[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[arma at torproject.org]

commit 384457912f771d39b98690c25aeea3e541dbfb28
Merge: 94b5128 83439e7
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu May 25 00:27:47 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22370 | 4 ++++
 src/or/dirserv.c | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)