Merge branch 'bug18921_squashed' into maint-0.2.8
commit01e7f42a09108e71cede46d4a038c4b1253a3d42
authorNick Mathewson <nickm@torproject.org>
Wed, 4 May 2016 19:23:26 +0000 (4 15:23 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 4 May 2016 19:23:26 +0000 (4 15:23 -0400)
treed4e9d54d47c877c602b2858a151c63d8588604a3
parent60274296c3e012bb0ca5ad3214e2b8aa0fe19e82
parent0cf90bac2a7136e0abb9fed160f70c543ad8b88a
Merge branch 'bug18921_squashed' into maint-0.2.8