Nick Mathewson 0c6d05cdd4 Merge branch 'maint-0.3.2'

2017-11-13 12:27:44 -05:00

..

common

Merge branch 'buf_for_stringbuffer_squashed'

2017-11-02 10:01:30 -04:00

config

Merge branch 'maint-0.3.0' into maint-0.3.1

2017-11-11 12:23:34 -05:00

ext

Merge branch 'bug23583_029'

2017-09-19 14:12:29 -04:00

or

Merge branch 'maint-0.3.2'

2017-11-13 12:27:44 -05:00

rust

annotate where C and Rust need to stay in sync

2017-11-11 23:19:34 -05:00

test

Merge branch 'bug24247_032'

2017-11-11 14:46:33 -05:00

tools

tor_runner.c: Add a circumlocution and a caveat.

2017-11-01 13:22:09 -04:00

trace

Add stub function for libor-trace.

2017-04-25 18:02:19 +02:00

trunnel

Re-run trunnel. Cosmetic changes only.

2017-08-24 16:13:01 -04:00

win32

bump to 0.3.2.4-alpha-dev

2017-11-08 16:44:53 -05:00

include.am

Add --enable-rust configure switch

2017-04-29 08:55:57 +02:00