[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit 9bc947dc18b71449454992c0cecf3b6811b74603
Merge: aab6aea19 df874ed0f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 10:01:41 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/bug26873 | 4 ++++
 1 file changed, 4 insertions(+)