Merge branch 'tor-github/pr/1294'

diff --cc src/app/config/confparse.c
Simple merge

diff --cc src/app/config/confparse.h
Simple merge

diff --cc src/lib/conf/conftypes.h
index 612272e4536164f0a48b4137f3f58313931df601,3db115204bc7e104197a12e5e8c7c71bf5cbce44..4609564b3497915b7552260f7429f0c117b471df
--- 1/src/lib/conf/conftypes.h
--- 2/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@@ -122,9 -100,13 +122,13 @@@ typedef struct struct_member_t 
   * that they have the correct type.
   */
  typedef struct struct_magic_decl_t {
+   /** The name of the structure */
    const char *typename;
+   /** A value used to recognize instances of this structure. */
    uint32_t magic_val;
 -  int magic_offset;
+   /** The location within the structure at which we expect to find
+    * <b>magic_val</b>. */
 +  ptrdiff_t magic_offset;
  } struct_magic_decl_t;
  
  /**