Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.4
commit55492e7d5a1dae4b2be49daed4abdafabf4366b7
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Apr 2015 18:08:46 +0000 (27 14:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Apr 2015 18:08:46 +0000 (27 14:08 -0400)
treee571ce6601052f2e0a0d22bf9ada5f6c7ebdb848
parent85169a121e3b59d2032281e72e0e14a53b6085a2
parentbcc0a48cfe6cfd3a96580fc345553fa3fb37c5b1
Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.4