Nick Mathewson a8d6eb30b8 Merge branch 'maint-0.2.4' into release-0.2.4 ...

Conflicts:
	configure.ac

2014-10-20 10:26:19 -04:00

..

bug13471

Note that our #13426 fix is also a #13471 fix.

2014-10-19 15:38:44 -04:00