Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
commit8d5f1e6961feb1ef2a80d6d5a36e755a4b79007b
authorNick Mathewson <nickm@torproject.org>
Mon, 24 Nov 2014 14:18:21 +0000 (24 09:18 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 24 Nov 2014 14:18:21 +0000 (24 09:18 -0500)
tree57291fd400ca3ad9c2e3318483d1d60b15dc7051
parentdca902ceba4d2440520d357ccc2e00b8aa59eb8b
parent8611c6bccd9fe4c688e83b28fb4e2b2b0fe7a6b3
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4