Nick Mathewson 04755ff764 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

2014-09-09 10:52:21 -04:00

..

bug12700

Fix relay_command_to_string(); solve 12700.

2014-08-18 13:21:40 -04:00

bug13071

Add more escaped() calls in directory.c

2014-09-09 10:22:01 -04:00

bug13081

Clean up the MVSC nmake files so they work again.

2014-09-09 10:27:05 -04:00

bug13085

Expand the event_mask field in controller conns to 64 bits

2014-09-08 15:16:02 -04:00