Merge remote-tracking branch 'origin/pr/86'
authorNick Mathewson <nickm@torproject.org>
Fri, 6 Dec 2013 15:37:53 +0000 (10:37 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 6 Dec 2013 15:37:53 +0000 (10:37 -0500)
commitaeb8d345b47bee0522f1ce32a20bfc8a642d657c
tree15407d184ccb6151dcd469148a0bb7ac71d2db9f
parentc11e7d919183e4a47324b6fd87e780059a8f1d58
parentf03d3535afad5b450f141148b0d1534d7c86bfe9
Merge remote-tracking branch 'origin/pr/86'