Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
commitf77d8901fc6e3836a2ef6e1ee58004dfb0546675
authorNick Mathewson <nickm@torproject.org>
Sun, 19 Oct 2014 15:13:09 +0000 (19 11:13 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 19 Oct 2014 15:13:09 +0000 (19 11:13 -0400)
tree57fa528d9a3384c35fe2a5edf4e6c3e4d8c81f59
parenta64f3ab3ee5c433cc1f046a7e26df7a49e308e4c
parentab4b29625db720817f9af502199ebf1ee3ac5af7
Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
configure.ac