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

[arma at torproject.org]

commit f8f34a82201a7a1ddea399b1a74e4f9181ab1873
Merge: 6758549 716d485
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed May 10 17:36:14 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 src/or/networkstatus.c | 1 +
 1 file changed, 1 insertion(+)