subject:"\[tor\-commits\] \[tor\/master\] Merge remote\-tracking branch 'twstrike\/options_test'"

[tor-commits] [tor/master] Merge remote-tracking branch 'twstrike/options_test'

2016-01-19 Thread nickm

commit ae3d2a93f0cbf05803d358b2e86de1f79f103669 Merge: f557a7f 32946e2 Author: Nick Mathewson Date: Tue Jan 19 20:14:18 2016 -0500 Merge remote-tracking branch 'twstrike/options_test' src/test/test_options.c | 10 ++ 1 file changed, 6 insertions(+), 4

[tor-commits] [tor/master] Merge remote-tracking branch 'twstrike/options_test'

2016-01-15 Thread nickm

commit 00b13cb09170e5144516698429c29975abe2de10 Merge: d748c19 1722232 Author: Nick Mathewson Date: Fri Jan 15 10:52:27 2016 -0500 Merge remote-tracking branch 'twstrike/options_test' src/common/compat.c |3 +- src/common/compat.h |3 +-